chrome/browser/sync/profile_sync_service_startup_unittest.cc - Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed

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/profile_sync_service_startup_unittest.cc

Issue 1433473007: [NOT FOR REVIEW] Copy of Max's CL with conflicts fixed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pss_strings

Patch Set: 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

Index: chrome/browser/sync/profile_sync_service_startup_unittest.cc

diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc

index a113b530b1ab3faef22e27570bff666d0b266c5f..ac3fde91ee502826a7319f9e637a1a709917fcad 100644

--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc

+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc

@@ -12,7 +12,6 @@

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

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

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

-#include "chrome/browser/sync/glue/sync_backend_host_mock.h"

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

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

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

@@ -29,6 +28,7 @@

#include "components/signin/core/common/signin_pref_names.h"

#include "components/sync_driver/data_type_manager.h"

#include "components/sync_driver/data_type_manager_mock.h"

+#include "components/sync_driver/glue/sync_backend_host_mock.h"

#include "components/sync_driver/pref_names.h"

#include "components/sync_driver/sync_api_component_factory_mock.h"

#include "components/sync_driver/sync_prefs.h"

« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/profile_sync_service_typed_url_unittest.cc » ('j') | no next file with comments »