chrome/browser/extensions/page_action_apitest.cc - Issue 5089001: Cleanup: Include browser.h -> ui/browser.h [Part 3].

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

Issue 5089001: Cleanup: Include browser.h -> ui/browser.h [Part 3]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixes. Created 10 years, 1 month 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 | « chrome/browser/extensions/notifications_apitest.cc ('k') | chrome/browser/external_tab_container_win.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/browser.h"

6 #include "chrome/browser/browser_window.h"

7 #include "chrome/browser/extensions/extension_apitest.h"	5 #include "chrome/browser/extensions/extension_apitest.h"

8 #include "chrome/browser/extensions/extension_browser_event_router.h"	6 #include "chrome/browser/extensions/extension_browser_event_router.h"

9 #include "chrome/browser/extensions/extension_tabs_module.h"	7 #include "chrome/browser/extensions/extension_tabs_module.h"

10 #include "chrome/browser/extensions/extensions_service.h"	8 #include "chrome/browser/extensions/extensions_service.h"

	9 #include "chrome/browser/location_bar.h"

11 #include "chrome/browser/profile.h"	10 #include "chrome/browser/profile.h"

12 #include "chrome/browser/location_bar.h"

13 #include "chrome/browser/tab_contents/tab_contents.h"	11 #include "chrome/browser/tab_contents/tab_contents.h"

	12 #include "chrome/browser/ui/browser.h"

	13 #include "chrome/browser/ui/browser_window.h"

	14 #include "chrome/common/extensions/extension_action.h"

14 #include "chrome/common/extensions/extension.h"	15 #include "chrome/common/extensions/extension.h"

15 #include "chrome/common/extensions/extension_action.h"

16 #include "chrome/test/ui_test_utils.h"	16 #include "chrome/test/ui_test_utils.h"

17	17

18 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {	18 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {

19 ASSERT_TRUE(test_server()->Start());	19 ASSERT_TRUE(test_server()->Start());

20 ASSERT_TRUE(RunExtensionTest("page_action/basics")) << message_;	20 ASSERT_TRUE(RunExtensionTest("page_action/basics")) << message_;

21 const Extension* extension = GetSingleLoadedExtension();	21 const Extension* extension = GetSingleLoadedExtension();

22 ASSERT_TRUE(extension) << message_;	22 ASSERT_TRUE(extension) << message_;

23 {	23 {

24 // Tell the extension to update the page action state.	24 // Tell the extension to update the page action state.

25 ResultCatcher catcher;	25 ResultCatcher catcher;

(...skipping 154 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
180 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TestCrash57333) {	180 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TestCrash57333) {

181 // Load extension A.	181 // Load extension A.

182 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("page_action")	182 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("page_action")

183 .AppendASCII("crash_57333")	183 .AppendASCII("crash_57333")

184 .AppendASCII("Extension1")));	184 .AppendASCII("Extension1")));

185 // Load extension B.	185 // Load extension B.

186 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("page_action")	186 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("page_action")

187 .AppendASCII("crash_57333")	187 .AppendASCII("crash_57333")

188 .AppendASCII("Extension2")));	188 .AppendASCII("Extension2")));

189 }	189 }

OLD	NEW