chrome/browser/extensions/api/dial/dial_apitest.cc - Issue 584513003: Move extension_test_message_listener to extensions.

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/dial/dial_apitest.cc

Issue 584513003: Move extension_test_message_listener to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase 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/declarative_content/set_icon_apitest.cc ('k') | chrome/browser/extensions/api/extension_action/browser_action_browsertest.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/command_line.h"	5 #include "base/command_line.h"

6 #include "chrome/browser/extensions/api/dial/dial_api.h"	6 #include "chrome/browser/extensions/api/dial/dial_api.h"

7 #include "chrome/browser/extensions/api/dial/dial_api_factory.h"	7 #include "chrome/browser/extensions/api/dial/dial_api_factory.h"

8 #include "chrome/browser/extensions/api/dial/dial_registry.h"	8 #include "chrome/browser/extensions/api/dial/dial_registry.h"

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

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

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

12 #include "extensions/common/switches.h"	11 #include "extensions/common/switches.h"

	12 #include "extensions/test/extension_test_message_listener.h"

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

14 #include "testing/gmock/include/gmock/gmock.h"	14 #include "testing/gmock/include/gmock/gmock.h"

15 #include "url/gurl.h"	15 #include "url/gurl.h"

16	16

17 using extensions::DialDeviceData;	17 using extensions::DialDeviceData;

18 using extensions::Extension;	18 using extensions::Extension;

19	19

20 namespace api = extensions::api;	20 namespace api = extensions::api;

21	21

22 namespace {	22 namespace {

(...skipping 84 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
107	107

108 EXPECT_TRUE(listener.WaitUntilSatisfied());	108 EXPECT_TRUE(listener.WaitUntilSatisfied());

109	109

110 listener.Reply("go");	110 listener.Reply("go");

111 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();	111 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();

112 }	112 }

113	113

114 IN_PROC_BROWSER_TEST_F(DialAPITest, OnError) {	114 IN_PROC_BROWSER_TEST_F(DialAPITest, OnError) {

115 ASSERT_TRUE(RunExtensionSubtest("dial/experimental", "on_error.html"));	115 ASSERT_TRUE(RunExtensionSubtest("dial/experimental", "on_error.html"));

116 }	116 }

OLD	NEW