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

Side by Side Diff: chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/extensions/browser_action_test_util.h" 6 #include "chrome/browser/extensions/browser_action_test_util.h"
7 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
8 #include "chrome/browser/extensions/extension_browser_event_router.h" 8 #include "chrome/browser/extensions/extension_browser_event_router.h"
9 #include "chrome/browser/extensions/extension_prefs.h" 9 #include "chrome/browser/extensions/extension_prefs.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/extensions/extension_tab_util.h" 11 #include "chrome/browser/extensions/extension_tab_util.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/sessions/restore_tab_helper.h" 13 #include "chrome/browser/sessions/restore_tab_helper.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_window.h" 15 #include "chrome/browser/ui/browser_window.h"
16 #include "chrome/browser/ui/omnibox/location_bar.h" 16 #include "chrome/browser/ui/omnibox/location_bar.h"
17 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 17 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/extensions/extension.h" 19 #include "chrome/common/extensions/extension.h"
20 #include "chrome/common/extensions/extension_action.h" 20 #include "chrome/common/extensions/extension_action.h"
21 #include "chrome/test/base/ui_test_utils.h" 21 #include "chrome/test/base/ui_test_utils.h"
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 23
24 // These are a mash-up of the tests from from page_actions_apitest.cc and 24 // These are a mash-up of the tests from from page_actions_apitest.cc and
25 // browser_actions_apitest.cc. 25 // browser_actions_apitest.cc.
26 26
27 using extensions::Extension;
28
27 namespace { 29 namespace {
28 30
29 class PageAsBrowserActionApiTest : public ExtensionApiTest { 31 class PageAsBrowserActionApiTest : public ExtensionApiTest {
30 public: 32 public:
31 PageAsBrowserActionApiTest() {} 33 PageAsBrowserActionApiTest() {}
32 virtual ~PageAsBrowserActionApiTest() {} 34 virtual ~PageAsBrowserActionApiTest() {}
33 35
34 void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 36 void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
35 ExtensionApiTest::SetUpCommandLine(command_line); 37 ExtensionApiTest::SetUpCommandLine(command_line);
36 command_line->AppendSwitch(switches::kEnableActionBox); 38 command_line->AppendSwitch(switches::kEnableActionBox);
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 const Extension* extension = GetSingleLoadedExtension(); 178 const Extension* extension = GetSingleLoadedExtension();
177 ASSERT_TRUE(extension) << message_; 179 ASSERT_TRUE(extension) << message_;
178 180
179 ResultCatcher catcher; 181 ResultCatcher catcher;
180 ui_test_utils::NavigateToURL(browser(), 182 ui_test_utils::NavigateToURL(browser(),
181 GURL(extension->GetResourceURL("update.html"))); 183 GURL(extension->GetResourceURL("update.html")));
182 ASSERT_TRUE(catcher.GetNextResult()); 184 ASSERT_TRUE(catcher.GetNextResult());
183 } 185 }
184 186
185 } 187 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698