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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/extensions/api/context_menus/context_menu_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/active_tab_apitest.cc ('k') | chrome/browser/extensions/api/dial/dial_apitest.cc » ('j') | no next file with comments »

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 "chrome/browser/extensions/extension_action.h"	5 #include "chrome/browser/extensions/extension_action.h"

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

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

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

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

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

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

11	12

12 namespace extensions {	13 namespace extensions {

13	14

14 // Times out on win syzyasan, http://crbug.com/166026	15 // Times out on win syzyasan, http://crbug.com/166026

15 #if defined(SYZYASAN)	16 #if defined(SYZYASAN)

16 #define MAYBE_ContextMenus DISABLED_ContextMenus	17 #define MAYBE_ContextMenus DISABLED_ContextMenus

17 #else	18 #else

18 #define MAYBE_ContextMenus ContextMenus	19 #define MAYBE_ContextMenus ContextMenus

19 #endif	20 #endif

20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ContextMenus) {	21 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ContextMenus) {

(...skipping 23 matching lines...) Expand all Loading...
44 {	45 {

45 // Tell the extension to update the page action state again.	46 // Tell the extension to update the page action state again.

46 ResultCatcher catcher;	47 ResultCatcher catcher;

47 ui_test_utils::NavigateToURL(browser(),	48 ui_test_utils::NavigateToURL(browser(),

48 extension->GetResourceURL("popup2.html"));	49 extension->GetResourceURL("popup2.html"));

49 ASSERT_TRUE(catcher.GetNextResult());	50 ASSERT_TRUE(catcher.GetNextResult());

50 }	51 }

51 }	52 }

52	53

53 } // namespace extensions	54 } // namespace extensions

OLD	NEW