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

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

Unified Diff: chrome/browser/extensions/api/socket/socket_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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc ('k') | chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/socket/socket_apitest.cc

diff --git a/chrome/browser/extensions/api/socket/socket_apitest.cc b/chrome/browser/extensions/api/socket/socket_apitest.cc

index 945c450ad86d969892ded22cb8ce016b6abd08e9..03ba0b458495a96a7599b441f495e1fc6fb25a0c 100644

--- a/chrome/browser/extensions/api/socket/socket_apitest.cc

+++ b/chrome/browser/extensions/api/socket/socket_apitest.cc

@@ -14,10 +14,12 @@

#include "extensions/browser/api/dns/host_resolver_wrapper.h"

#include "extensions/browser/api/dns/mock_host_resolver_creator.h"

#include "extensions/browser/api/socket/socket_api.h"

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

#include "net/dns/mock_host_resolver.h"

#include "net/test/spawned_test_server/spawned_test_server.h"

using extensions::Extension;

+using extensions::ResultCatcher;

namespace {

@@ -69,7 +71,7 @@ IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketUDPExtension) {

host_port_pair.set_host("LOCALhost");

ResultCatcher catcher;

- catcher.RestrictToProfile(browser()->profile());

+ catcher.RestrictToBrowserContext(browser()->profile());

ExtensionTestMessageListener listener("info_please", true);

@@ -97,7 +99,7 @@ IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketTCPExtension) {

host_port_pair.set_host("lOcAlHoSt");

ResultCatcher catcher;

- catcher.RestrictToProfile(browser()->profile());

+ catcher.RestrictToBrowserContext(browser()->profile());

ExtensionTestMessageListener listener("info_please", true);

@@ -111,7 +113,7 @@ IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketTCPExtension) {

IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketTCPServerExtension) {

ResultCatcher catcher;

- catcher.RestrictToProfile(browser()->profile());

+ catcher.RestrictToBrowserContext(browser()->profile());

ExtensionTestMessageListener listener("info_please", true);

ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("socket/api")));

EXPECT_TRUE(listener.WaitUntilSatisfied());

@@ -137,7 +139,7 @@ IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketTCPServerUnbindOnUnload) {

IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketMulticast) {

ResultCatcher catcher;

- catcher.RestrictToProfile(browser()->profile());

+ catcher.RestrictToBrowserContext(browser()->profile());

ExtensionTestMessageListener listener("info_please", true);

ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("socket/api")));

EXPECT_TRUE(listener.WaitUntilSatisfied());