chrome/browser/extensions/api/push_messaging/push_messaging_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/push_messaging/push_messaging_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/proxy/proxy_apitest.cc ('k') | chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc

diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc

index e176f3261a089b12df68193ae405119df791984a..4cef006ca4c02300119de88d1da13ce8da12d680 100644

--- a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc

+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc

@@ -21,6 +21,7 @@

#include "components/invalidation/invalidation_service.h"

#include "components/invalidation/profile_invalidation_provider.h"

#include "components/keyed_service/core/keyed_service.h"

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

#include "google/cacheinvalidation/types.pb.h"

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

@@ -113,7 +114,7 @@ class PushMessagingApiTest : public ExtensionApiTest {

IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, EventDispatch) {

ResultCatcher catcher;

- catcher.RestrictToProfile(profile());

+ catcher.RestrictToBrowserContext(profile());

const extensions::Extension* extension =

LoadExtension(test_data_dir_.AppendASCII("push_messaging"));

@@ -130,7 +131,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, EventDispatch) {

// that we install.

IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, ReceivesPush) {

ResultCatcher catcher;

- catcher.RestrictToProfile(profile());

+ catcher.RestrictToBrowserContext(profile());

const extensions::Extension* extension =

LoadExtension(test_data_dir_.AppendASCII("push_messaging"));

@@ -196,7 +197,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, Restart) {

// Test that GetChannelId fails if no user is signed in.

IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, GetChannelId) {

ResultCatcher catcher;

- catcher.RestrictToProfile(profile());

+ catcher.RestrictToBrowserContext(profile());

const extensions::Extension* extension =

LoadExtension(test_data_dir_.AppendASCII("push_messaging"));