chrome/browser/sync/test/integration/sync_test.cc - Issue 315433002: Retry: Move some sync/notifier to components/invalidation

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/sync/test/integration/sync_test.cc

Issue 315433002: Retry: Move some sync/notifier to components/invalidation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Undo gyp hack Created 6 years, 6 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:

Index: chrome/browser/sync/test/integration/sync_test.cc

diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc

index 12b80fe94c1707ed45d9f12ec730e63bbcb4cac7..ec2c9622ed03248eb4838efc5eab1f3ee41cc7de 100644

--- a/chrome/browser/sync/test/integration/sync_test.cc

+++ b/chrome/browser/sync/test/integration/sync_test.cc

@@ -52,6 +52,7 @@

#include "components/bookmarks/test/bookmark_test_helpers.h"

#include "components/invalidation/invalidation_switches.h"

#include "components/invalidation/p2p_invalidation_service.h"

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

#include "components/os_crypt/os_crypt.h"

#include "components/signin/core/browser/signin_manager.h"

#include "content/public/browser/web_contents.h"

@@ -70,7 +71,6 @@

#include "net/url_request/url_request_context.h"

#include "net/url_request/url_request_context_getter.h"

#include "sync/engine/sync_scheduler_impl.h"

-#include "sync/notifier/p2p_invalidator.h"

#include "sync/protocol/sync.pb.h"

#include "sync/test/fake_server/fake_server.h"

#include "sync/test/fake_server/fake_server_network_resources.h"