diff options
author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 04:24:37 +0000 |
---|---|---|
committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 04:24:37 +0000 |
commit | d2c513cedd908259fa3a9c9d0aac79d4edffae99 (patch) | |
tree | 691094fff2daf1bedf5c27cc16985af6ef423470 /chrome | |
parent | a5ff559cf1182c4e86293784a64a52574eada1b4 (diff) | |
download | chromium_src-d2c513cedd908259fa3a9c9d0aac79d4edffae99.zip chromium_src-d2c513cedd908259fa3a9c9d0aac79d4edffae99.tar.gz chromium_src-d2c513cedd908259fa3a9c9d0aac79d4edffae99.tar.bz2 |
Enable nacl_helper by default.
BUG=92964,nativeclient:480
TEST=nacl_integration in chromium bots
Review URL: http://codereview.chromium.org/7821021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/extensions/extension_nacl_browsertest.cc | 16 | ||||
-rw-r--r-- | chrome/nacl/nacl_fork_delegate_linux.cc | 7 | ||||
-rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 3 |
3 files changed, 1 insertions, 25 deletions
diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc index ebce70f..dc93bad 100644 --- a/chrome/browser/extensions/extension_nacl_browsertest.cc +++ b/chrome/browser/extensions/extension_nacl_browsertest.cc @@ -93,12 +93,7 @@ class NaClExtensionTest : public ExtensionBrowserTest { }; // Test that the NaCl plugin isn't blocked for Webstore extensions. -// DISABLED http://crbug.com/92964 -#if defined(OS_LINUX) && ARCH_CPU_32_BITS -IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_WebStoreExtension) { -#else IN_PROC_BROWSER_TEST_F(NaClExtensionTest, WebStoreExtension) { -#endif ASSERT_TRUE(test_server()->Start()); const Extension* extension = InstallExtension(INSTALL_TYPE_FROM_WEBSTORE); @@ -116,12 +111,7 @@ IN_PROC_BROWSER_TEST_F(NaClExtensionTest, NonWebStoreExtension) { } // Test that the NaCl plugin isn't blocked for component extensions. -// DISABLED http://crbug.com/92964 -#if defined(OS_LINUX) && ARCH_CPU_32_BITS -IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_ComponentExtension) { -#else IN_PROC_BROWSER_TEST_F(NaClExtensionTest, ComponentExtension) { -#endif ASSERT_TRUE(test_server()->Start()); const Extension* extension = InstallExtension(INSTALL_TYPE_COMPONENT); @@ -131,12 +121,7 @@ IN_PROC_BROWSER_TEST_F(NaClExtensionTest, ComponentExtension) { } // Test that the NaCl plugin isn't blocked for unpacked extensions. -// DISABLED http://crbug.com/92964 -#if defined(OS_LINUX) && ARCH_CPU_32_BITS -IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_UnpackedExtension) { -#else IN_PROC_BROWSER_TEST_F(NaClExtensionTest, UnpackedExtension) { -#endif ASSERT_TRUE(test_server()->Start()); const Extension* extension = InstallExtension(INSTALL_TYPE_UNPACKED); @@ -146,4 +131,3 @@ IN_PROC_BROWSER_TEST_F(NaClExtensionTest, UnpackedExtension) { } } // namespace - diff --git a/chrome/nacl/nacl_fork_delegate_linux.cc b/chrome/nacl/nacl_fork_delegate_linux.cc index 26fae53..93b0a84 100644 --- a/chrome/nacl/nacl_fork_delegate_linux.cc +++ b/chrome/nacl/nacl_fork_delegate_linux.cc @@ -44,15 +44,10 @@ void NaClForkDelegate::Init(const bool sandboxed, base::file_handle_mapping_vector fds_to_map; fds_to_map.push_back(std::make_pair(fds[1], kNaClZygoteDescriptor)); fds_to_map.push_back(std::make_pair(sandboxdesc, kNaClSandboxDescriptor)); - // TODO(bradchen): To make this the default for release builds, - // remove command line switch. ready_ = false; - const bool use_helper = CommandLine::ForCurrentProcess()->HasSwitch( - switches::kNaClLinuxHelper); FilePath helper_exe; FilePath helper_bootstrap_exe; - if (use_helper && - PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe) && + if (PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe) && PathService::Get(chrome::FILE_NACL_HELPER_BOOTSTRAP, &helper_bootstrap_exe)) { CommandLine::StringVector argv = CommandLine::ForCurrentProcess()->argv(); diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 921c14d..858d5ad 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -406,8 +406,6 @@ WebPlugin* ChromeContentRendererClient::CreatePluginImpl( // Enforce Chrome WebStore restriction on the Native Client plugin. if (info.name == ASCIIToUTF16(ChromeContentClient::kNaClPluginName)) { bool allow_nacl = cmd->HasSwitch(switches::kEnableNaCl); - // TODO(elijahtaylor) Remove this #if when crbug.com/92964 is fixed. -#if !(defined(OS_LINUX) && ARCH_CPU_32_BITS) if (!allow_nacl) { const char* kNaClPluginMimeType = "application/x-nacl"; const char* kNaClPluginManifestAttribute = "nacl"; @@ -445,7 +443,6 @@ WebPlugin* ChromeContentRendererClient::CreatePluginImpl( extension->location() == Extension::COMPONENT || extension->location() == Extension::LOAD); } -#endif // !(defined(OS_LINUX) && ARCH_CPU_32_BITS) if (!allow_nacl) { // TODO(bbudge) Webkit will crash if this is a full-frame plug-in and |