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

Side by Side Diff: chrome/browser/extensions/api/extension_action/page_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 "chrome/browser/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "chrome/browser/extensions/extension_browser_event_router.h" 6 #include "chrome/browser/extensions/extension_browser_event_router.h"
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/extensions/extension_tab_util.h" 8 #include "chrome/browser/extensions/extension_tab_util.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/sessions/restore_tab_helper.h" 10 #include "chrome/browser/sessions/restore_tab_helper.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/browser_window.h" 12 #include "chrome/browser/ui/browser_window.h"
13 #include "chrome/browser/ui/omnibox/location_bar.h" 13 #include "chrome/browser/ui/omnibox/location_bar.h"
14 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 14 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
15 #include "chrome/common/extensions/extension.h" 15 #include "chrome/common/extensions/extension.h"
16 #include "chrome/common/extensions/extension_action.h" 16 #include "chrome/common/extensions/extension_action.h"
17 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
18 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
19 19
20 using extensions::Extension;
21
20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) { 22 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {
21 ASSERT_TRUE(test_server()->Start()); 23 ASSERT_TRUE(test_server()->Start());
22 ASSERT_TRUE(RunExtensionTest("page_action/basics")) << message_; 24 ASSERT_TRUE(RunExtensionTest("page_action/basics")) << message_;
23 const Extension* extension = GetSingleLoadedExtension(); 25 const Extension* extension = GetSingleLoadedExtension();
24 ASSERT_TRUE(extension) << message_; 26 ASSERT_TRUE(extension) << message_;
25 { 27 {
26 // Tell the extension to update the page action state. 28 // Tell the extension to update the page action state.
27 ResultCatcher catcher; 29 ResultCatcher catcher;
28 ui_test_utils::NavigateToURL(browser(), 30 ui_test_utils::NavigateToURL(browser(),
29 GURL(extension->GetResourceURL("update.html"))); 31 GURL(extension->GetResourceURL("update.html")));
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Getters) { 200 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Getters) {
199 ASSERT_TRUE(RunExtensionTest("page_action/getters")) << message_; 201 ASSERT_TRUE(RunExtensionTest("page_action/getters")) << message_;
200 const Extension* extension = GetSingleLoadedExtension(); 202 const Extension* extension = GetSingleLoadedExtension();
201 ASSERT_TRUE(extension) << message_; 203 ASSERT_TRUE(extension) << message_;
202 204
203 ResultCatcher catcher; 205 ResultCatcher catcher;
204 ui_test_utils::NavigateToURL(browser(), 206 ui_test_utils::NavigateToURL(browser(),
205 GURL(extension->GetResourceURL("update.html"))); 207 GURL(extension->GetResourceURL("update.html")));
206 ASSERT_TRUE(catcher.GetNextResult()); 208 ASSERT_TRUE(catcher.GetNextResult());
207 } 209 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698