Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Side by Side Diff: chrome/browser/extensions/extension_nacl_browsertest.cc

Issue 7821021: Enable nacl_helper by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Eliminate --nacl-linux-helper flag Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/nacl/nacl_fork_delegate_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/browser/extensions/crx_installer.h" 7 #include "chrome/browser/extensions/crx_installer.h"
8 #include "chrome/browser/extensions/extension_browsertest.h" 8 #include "chrome/browser/extensions/extension_browsertest.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 tab_contents->render_view_host(), L"", 86 tab_contents->render_view_host(), L"",
87 L"window.domAutomationController.send(ContentHandlerPluginCreated());", 87 L"window.domAutomationController.send(ContentHandlerPluginCreated());",
88 &content_handler_plugin_created)); 88 &content_handler_plugin_created));
89 89
90 EXPECT_EQ(should_create, embedded_plugin_created); 90 EXPECT_EQ(should_create, embedded_plugin_created);
91 EXPECT_EQ(should_create, content_handler_plugin_created); 91 EXPECT_EQ(should_create, content_handler_plugin_created);
92 } 92 }
93 }; 93 };
94 94
95 // Test that the NaCl plugin isn't blocked for Webstore extensions. 95 // Test that the NaCl plugin isn't blocked for Webstore extensions.
96 // DISABLED http://crbug.com/92964
97 #if defined(OS_LINUX) && ARCH_CPU_32_BITS
98 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_WebStoreExtension) {
99 #else
100 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, WebStoreExtension) { 96 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, WebStoreExtension) {
101 #endif
102 ASSERT_TRUE(test_server()->Start()); 97 ASSERT_TRUE(test_server()->Start());
103 98
104 const Extension* extension = InstallExtension(INSTALL_TYPE_FROM_WEBSTORE); 99 const Extension* extension = InstallExtension(INSTALL_TYPE_FROM_WEBSTORE);
105 ASSERT_TRUE(extension); 100 ASSERT_TRUE(extension);
106 CheckPluginsCreated(extension, true); 101 CheckPluginsCreated(extension, true);
107 } 102 }
108 103
109 // Test that the NaCl plugin is blocked for non-Webstore extensions. 104 // Test that the NaCl plugin is blocked for non-Webstore extensions.
110 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, NonWebStoreExtension) { 105 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, NonWebStoreExtension) {
111 ASSERT_TRUE(test_server()->Start()); 106 ASSERT_TRUE(test_server()->Start());
112 107
113 const Extension* extension = InstallExtension(INSTALL_TYPE_NON_WEBSTORE); 108 const Extension* extension = InstallExtension(INSTALL_TYPE_NON_WEBSTORE);
114 ASSERT_TRUE(extension); 109 ASSERT_TRUE(extension);
115 CheckPluginsCreated(extension, false); 110 CheckPluginsCreated(extension, false);
116 } 111 }
117 112
118 // Test that the NaCl plugin isn't blocked for component extensions. 113 // Test that the NaCl plugin isn't blocked for component extensions.
119 // DISABLED http://crbug.com/92964
120 #if defined(OS_LINUX) && ARCH_CPU_32_BITS
121 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_ComponentExtension) {
122 #else
123 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, ComponentExtension) { 114 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, ComponentExtension) {
124 #endif
125 ASSERT_TRUE(test_server()->Start()); 115 ASSERT_TRUE(test_server()->Start());
126 116
127 const Extension* extension = InstallExtension(INSTALL_TYPE_COMPONENT); 117 const Extension* extension = InstallExtension(INSTALL_TYPE_COMPONENT);
128 ASSERT_TRUE(extension); 118 ASSERT_TRUE(extension);
129 ASSERT_EQ(extension->location(), Extension::COMPONENT); 119 ASSERT_EQ(extension->location(), Extension::COMPONENT);
130 CheckPluginsCreated(extension, true); 120 CheckPluginsCreated(extension, true);
131 } 121 }
132 122
133 // Test that the NaCl plugin isn't blocked for unpacked extensions. 123 // Test that the NaCl plugin isn't blocked for unpacked extensions.
134 // DISABLED http://crbug.com/92964
135 #if defined(OS_LINUX) && ARCH_CPU_32_BITS
136 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_UnpackedExtension) {
137 #else
138 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, UnpackedExtension) { 124 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, UnpackedExtension) {
139 #endif
140 ASSERT_TRUE(test_server()->Start()); 125 ASSERT_TRUE(test_server()->Start());
141 126
142 const Extension* extension = InstallExtension(INSTALL_TYPE_UNPACKED); 127 const Extension* extension = InstallExtension(INSTALL_TYPE_UNPACKED);
143 ASSERT_TRUE(extension); 128 ASSERT_TRUE(extension);
144 ASSERT_EQ(extension->location(), Extension::LOAD); 129 ASSERT_EQ(extension->location(), Extension::LOAD);
145 CheckPluginsCreated(extension, true); 130 CheckPluginsCreated(extension, true);
146 } 131 }
147 132
148 } // namespace 133 } // namespace
149
OLDNEW
« no previous file with comments | « no previous file | chrome/nacl/nacl_fork_delegate_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698