chrome/browser/extensions/api/extension_action/browser_action_apitest.cc - Issue 555633003: Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher.

Side by Side Diff: chrome/browser/extensions/api/extension_action/browser_action_apitest.cc

Issue 555633003: Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Created 6 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

« no previous file with comments | « chrome/browser/extensions/api/dial/dial_apitest.cc ('k') | chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "build/build_config.h"	5 #include "build/build_config.h"

6 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"	6 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"

7 #include "chrome/browser/extensions/browser_action_test_util.h"	7 #include "chrome/browser/extensions/browser_action_test_util.h"

8 #include "chrome/browser/extensions/extension_action.h"	8 #include "chrome/browser/extensions/extension_action.h"

9 #include "chrome/browser/extensions/extension_action_icon_factory.h"	9 #include "chrome/browser/extensions/extension_action_icon_factory.h"

10 #include "chrome/browser/extensions/extension_action_manager.h"	10 #include "chrome/browser/extensions/extension_action_manager.h"

11 #include "chrome/browser/extensions/extension_apitest.h"	11 #include "chrome/browser/extensions/extension_apitest.h"

12 #include "chrome/browser/extensions/extension_service.h"	12 #include "chrome/browser/extensions/extension_service.h"

13 #include "chrome/browser/extensions/extension_tab_util.h"	13 #include "chrome/browser/extensions/extension_tab_util.h"

14 #include "chrome/browser/extensions/extension_toolbar_model.h"	14 #include "chrome/browser/extensions/extension_toolbar_model.h"

15 #include "chrome/browser/profiles/profile.h"	15 #include "chrome/browser/profiles/profile.h"

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

17 #include "chrome/browser/ui/browser_commands.h"	17 #include "chrome/browser/ui/browser_commands.h"

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

19 #include "chrome/browser/ui/tabs/tab_strip_model.h"	19 #include "chrome/browser/ui/tabs/tab_strip_model.h"

20 #include "chrome/common/url_constants.h"	20 #include "chrome/common/url_constants.h"

21 #include "chrome/test/base/ui_test_utils.h"	21 #include "chrome/test/base/ui_test_utils.h"

22 #include "content/public/browser/notification_service.h"	22 #include "content/public/browser/notification_service.h"

23 #include "content/public/browser/web_contents.h"	23 #include "content/public/browser/web_contents.h"

24 #include "content/public/test/browser_test_utils.h"	24 #include "content/public/test/browser_test_utils.h"

25 #include "extensions/browser/extension_system.h"	25 #include "extensions/browser/extension_system.h"

26 #include "extensions/browser/notification_types.h"	26 #include "extensions/browser/notification_types.h"

27 #include "extensions/common/feature_switch.h"	27 #include "extensions/common/feature_switch.h"

	28 #include "extensions/test/result_catcher.h"

28 #include "grit/theme_resources.h"	29 #include "grit/theme_resources.h"

29 #include "ui/base/resource/resource_bundle.h"	30 #include "ui/base/resource/resource_bundle.h"

30 #include "ui/gfx/image/image_skia.h"	31 #include "ui/gfx/image/image_skia.h"

31 #include "ui/gfx/image/image_skia_operations.h"	32 #include "ui/gfx/image/image_skia_operations.h"

32 #include "ui/gfx/rect.h"	33 #include "ui/gfx/rect.h"

33 #include "ui/gfx/size.h"	34 #include "ui/gfx/size.h"

34 #include "ui/gfx/skia_util.h"	35 #include "ui/gfx/skia_util.h"

35	36

36 using content::WebContents;	37 using content::WebContents;

37	38

(...skipping 683 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
721 const std::string script =	722 const std::string script =

722 "window.domAutomationController.send(document.body.style."	723 "window.domAutomationController.send(document.body.style."

723 "backgroundColor);";	724 "backgroundColor);";

724 std::string result;	725 std::string result;

725 EXPECT_TRUE(content::ExecuteScriptAndExtractString(tab, script, &result));	726 EXPECT_TRUE(content::ExecuteScriptAndExtractString(tab, script, &result));

726 EXPECT_EQ(result, "red");	727 EXPECT_EQ(result, "red");

727 }	728 }

728	729

729 } // namespace	730 } // namespace

730 } // namespace extensions	731 } // namespace extensions

OLD	NEW