chrome/browser/extensions/active_tab_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/active_tab_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/chromeos/login/signin/oauth2_browsertest.cc ('k') | chrome/browser/extensions/api/context_menus/context_menu_apitest.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 "base/logging.h"	5 #include "base/logging.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/extension_apitest.h"	7 #include "chrome/browser/extensions/extension_apitest.h"

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

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

10 #include "extensions/common/extension.h"	10 #include "extensions/common/extension.h"

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

11 #include "net/test/embedded_test_server/embedded_test_server.h"	12 #include "net/test/embedded_test_server/embedded_test_server.h"

12	13

13 namespace extensions {	14 namespace extensions {

14 namespace {	15 namespace {

15	16

16 // Times out on win syzyasan, http://crbug.com/166026	17 // Times out on win syzyasan, http://crbug.com/166026

17 #if defined(SYZYASAN)	18 #if defined(SYZYASAN)

18 #define MAYBE_ActiveTab DISABLED_ActiveTab	19 #define MAYBE_ActiveTab DISABLED_ActiveTab

19 #else	20 #else

20 #define MAYBE_ActiveTab ActiveTab	21 #define MAYBE_ActiveTab ActiveTab

(...skipping 29 matching lines...) Expand all Loading...
50 ui_test_utils::NavigateToURL(	51 ui_test_utils::NavigateToURL(

51 browser(),	52 browser(),

52 embedded_test_server()->GetURL(	53 embedded_test_server()->GetURL(

53 "/extensions/api_test/active_tab/final_page.html"));	54 "/extensions/api_test/active_tab/final_page.html"));

54 EXPECT_TRUE(catcher.GetNextResult()) << message_;	55 EXPECT_TRUE(catcher.GetNextResult()) << message_;

55 }	56 }

56 }	57 }

57	58

58 } // namespace	59 } // namespace

59 } // namespace extensions	60 } // namespace extensions

OLD	NEW