Remove the NaCl SRPC proxy from Chrome.
Removes GYP targets for untrusted and trusted parts of the proxy (SRPC proxy
source files will be removed in a follow-on, to keep this patch manageable.)
Removes SRPC proxy startup code from NaCl trusted plugin.
Removes PPAPI PPP* interface adapters from the Plugin class.
Removes a bunch of GYP external dependency declarations that are no longer
needed.
[email protected] for OWNERS
BUG=169152
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11783112
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177531 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
index 4b529ac..be84b774 100644
--- a/chrome/browser/nacl_host/nacl_process_host.cc
+++ b/chrome/browser/nacl_host/nacl_process_host.cc
@@ -168,7 +168,6 @@
enable_debug_stub_(false),
uses_irt_(uses_irt),
off_the_record_(off_the_record),
- enable_ipc_proxy_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(ipc_plugin_listener_(this)),
render_view_id_(render_view_id) {
process_.reset(content::BrowserChildProcessHost::Create(
@@ -189,13 +188,6 @@
}
enable_debug_stub_ = CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableNaClDebug);
-
- enable_ipc_proxy_ = !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableNaClSRPCProxy);
- // If render_view_id == 0 we do not need PPAPI, so we can skip
- // PPAPI IPC proxy channel creation, etc.
- if (!render_view_id_)
- enable_ipc_proxy_ = false;
}
NaClProcessHost::~NaClProcessHost() {
@@ -720,7 +712,8 @@
params.enable_exception_handling = enable_exception_handling_;
params.enable_debug_stub = enable_debug_stub_ &&
NaClBrowser::GetInstance()->URLMatchesDebugPatterns(manifest_url_);
- params.enable_ipc_proxy = enable_ipc_proxy_;
+ // Enable PPAPI proxy channel creation only for renderer processes.
+ params.enable_ipc_proxy = enable_ppapi_proxy();
params.uses_irt = uses_irt_;
const ChildProcessData& data = process_->GetData();
@@ -779,7 +772,7 @@
}
bool NaClProcessHost::SendStart() {
- if (!enable_ipc_proxy_) {
+ if (!enable_ppapi_proxy()) {
if (!ReplyToRenderer(IPC::ChannelHandle()))
return false;
}
@@ -791,7 +784,8 @@
// listener.
void NaClProcessHost::OnPpapiChannelCreated(
const IPC::ChannelHandle& channel_handle) {
- DCHECK(enable_ipc_proxy_);
+ // Only renderer processes should create a channel.
+ DCHECK(enable_ppapi_proxy());
// If the proxy channel is null, this must be the initial NaCl-Browser IPC
// channel.
if (!ipc_proxy_channel_.get()) {
