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

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

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 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
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/file_path.h" 6 #include "base/file_path.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/extensions/crx_installer.h" 9 #include "chrome/browser/extensions/crx_installer.h"
10 #include "chrome/browser/extensions/extension_browsertest.h" 10 #include "chrome/browser/extensions/extension_browsertest.h"
11 #include "chrome/browser/extensions/extension_service.h" 11 #include "chrome/browser/extensions/extension_service.h"
12 #include "chrome/browser/prefs/pref_service.h" 12 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/common/chrome_paths.h" 15 #include "chrome/common/chrome_paths.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "chrome/test/base/ui_test_utils.h" 18 #include "chrome/test/base/ui_test_utils.h"
19 #include "content/public/browser/plugin_service.h" 19 #include "content/public/browser/plugin_service.h"
20 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
21 #include "webkit/plugins/webplugininfo.h" 21 #include "webkit/plugins/webplugininfo.h"
22 22
23 using content::PluginService; 23 using content::PluginService;
24 using content::WebContents; 24 using content::WebContents;
25 using extensions::Extension;
25 26
26 namespace { 27 namespace {
27 28
28 const char* kExtensionId = "bjjcibdiodkkeanflmiijlcfieiemced"; 29 const char* kExtensionId = "bjjcibdiodkkeanflmiijlcfieiemced";
29 30
30 // This class tests that the Native Client plugin is blocked unless the 31 // This class tests that the Native Client plugin is blocked unless the
31 // .nexe is part of an extension from the Chrome Webstore. 32 // .nexe is part of an extension from the Chrome Webstore.
32 class NaClExtensionTest : public ExtensionBrowserTest { 33 class NaClExtensionTest : public ExtensionBrowserTest {
33 public: 34 public:
34 NaClExtensionTest() { 35 NaClExtensionTest() {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, UnpackedExtension) { 146 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, UnpackedExtension) {
146 ASSERT_TRUE(test_server()->Start()); 147 ASSERT_TRUE(test_server()->Start());
147 148
148 const Extension* extension = InstallExtension(INSTALL_TYPE_UNPACKED); 149 const Extension* extension = InstallExtension(INSTALL_TYPE_UNPACKED);
149 ASSERT_TRUE(extension); 150 ASSERT_TRUE(extension);
150 ASSERT_EQ(extension->location(), Extension::LOAD); 151 ASSERT_EQ(extension->location(), Extension::LOAD);
151 CheckPluginsCreated(extension, true); 152 CheckPluginsCreated(extension, true);
152 } 153 }
153 154
154 } // namespace 155 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_module.cc ('k') | chrome/browser/extensions/extension_navigation_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698