chrome/browser/sync/test/integration/sync_test.cc - Issue 1419103009: [Sync] Componentize ProfileSyncService

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 1419103009: [Sync] Componentize ProfileSyncService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@max_bogue_sync_backend_host

Patch Set: Rebase Created 5 years, 1 month 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/sync/test/integration/sync_integration_test_util.cc ('k') | chrome/browser/sync/test/integration/updated_progress_marker_checker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 daa5313ca2484b66b3893f1750bbc157a64a8641..88d6f5c91c9d391640aa6aeb6a608ebfe31624a3 100644

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

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

@@ -32,7 +32,6 @@

#include "chrome/browser/search_engines/template_url_service_factory.h"

#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

#include "chrome/browser/signin/signin_manager_factory.h"

-#include "chrome/browser/sync/profile_sync_service.h"

#include "chrome/browser/sync/profile_sync_service_factory.h"

#include "chrome/browser/sync/test/integration/fake_server_invalidation_service.h"

#include "chrome/browser/sync/test/integration/p2p_invalidation_forwarder.h"

@@ -55,6 +54,7 @@

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

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

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

+#include "components/browser_sync/browser/profile_sync_service.h"

#include "components/google/core/browser/google_url_tracker.h"

#include "components/invalidation/impl/invalidation_switches.h"

#include "components/invalidation/impl/p2p_invalidation_service.h"