chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc - Issue 255273002: First step towards invalidations componentization

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 255273002: First step towards invalidations componentization (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to fix merge conflict Created 6 years, 7 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_api.cc ('k') | chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.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 9e80fd8e47114e95e8dd88d210754d5cee59675b..a1993a9e7f497291ef2912ab45d2883b8c3503df 100644

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

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

@@ -11,12 +11,12 @@

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

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

#include "chrome/browser/invalidation/fake_invalidation_service.h"

-#include "chrome/browser/invalidation/invalidation_service.h"

#include "chrome/browser/invalidation/invalidation_service_factory.h"

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

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

#include "chrome/common/chrome_switches.h"

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

+#include "components/invalidation/invalidation_service.h"

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

#include "sync/internal_api/public/base/invalidation.h"

#include "sync/notifier/fake_invalidator.h"