diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 21:00:29 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 21:00:29 +0000 |
| commit | 45a9c0aa35cc234293ed396b47c72c8ca04a06dd (patch) | |
| tree | 560e5e771aa857fc3a6f77c24552c8fc01a5ebba /chrome/browser | |
| parent | 8d3c7d6e06e31def105c6aa29c003f37fdf52da5 (diff) | |
| download | chromium_src-45a9c0aa35cc234293ed396b47c72c8ca04a06dd.zip chromium_src-45a9c0aa35cc234293ed396b47c72c8ca04a06dd.tar.gz chromium_src-45a9c0aa35cc234293ed396b47c72c8ca04a06dd.tar.bz2 | |
Make the Chrome IPC-based proxy the default for Native Client.
This change removes --enable-nacl-ipc-proxy and adds --enable-nacl-srpc-proxy.
The IPC PPAPI proxy is now the default.
BUG=116317
TEST=manual
Review URL: https://codereview.chromium.org/11358023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/about_flags.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/nacl_host/nacl_browser.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 27ac4fd..e4b4dd9 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -417,11 +417,11 @@ const Experiment kExperiments[] = { // TODO(bbudge): When NaCl switches to the IPC-based proxy, remove this // flag entry. { - "enable-nacl-ipc-proxy", // FLAGS:RECORD_UMA - IDS_FLAGS_ENABLE_NACL_IPC_PROXY_NAME, - IDS_FLAGS_ENABLE_NACL_IPC_PROXY_DESCRIPTION, + "enable-nacl-srpc-proxy", // FLAGS:RECORD_UMA + IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_NAME, + IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_DESCRIPTION, kOsAll, - SINGLE_VALUE_TYPE(switches::kEnableNaClIPCProxy) + SINGLE_VALUE_TYPE(switches::kEnableNaClSRPCProxy) }, { "enable-scripted-speech", // FLAGS:RECORD_UMA diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 758eb51..000da0d 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -946,7 +946,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( switches::kEnableExperimentalExtensionApis, switches::kEnableIPCFuzzing, switches::kEnableNaCl, - switches::kEnableNaClIPCProxy, + switches::kEnableNaClSRPCProxy, switches::kEnablePasswordGeneration, switches::kEnablePnacl, switches::kEnableWatchdog, diff --git a/chrome/browser/nacl_host/nacl_browser.cc b/chrome/browser/nacl_host/nacl_browser.cc index 9d483ee..43f7901 100644 --- a/chrome/browser/nacl_host/nacl_browser.cc +++ b/chrome/browser/nacl_host/nacl_browser.cc @@ -38,10 +38,10 @@ enum ValidationCacheStatus { const FilePath::StringType NaClIrtName() { FilePath::StringType irt_name; if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableNaClIPCProxy)) - irt_name.append(FILE_PATH_LITERAL("nacl_ipc_irt_")); - else + switches::kEnableNaClSRPCProxy)) irt_name.append(FILE_PATH_LITERAL("nacl_irt_")); + else + irt_name.append(FILE_PATH_LITERAL("nacl_ipc_irt_")); #if defined(ARCH_CPU_X86_FAMILY) #if defined(ARCH_CPU_X86_64) diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 585e618d..154ac46 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -174,8 +174,8 @@ NaClProcessHost::NaClProcessHost(const GURL& manifest_url, enable_debug_stub_ = CommandLine::ForCurrentProcess()->HasSwitch( switches::kEnableNaClDebug); - enable_ipc_proxy_ = CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableNaClIPCProxy); + enable_ipc_proxy_ = !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableNaClSRPCProxy); } NaClProcessHost::~NaClProcessHost() { |