chrome/browser/sync/profile_sync_service_unittest.cc - Issue 398423002: Sync: Refactoring of DEVICE_INFO syncable type - Part 1

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_unittest.cc

Issue 398423002: Sync: Refactoring of DEVICE_INFO syncable type - Part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed wrong signin_scoped_device_id assert from LocalDeviceInfoProvider. Created 6 years, 5 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/sync/profile_sync_service_startup_unittest.cc ('k') | chrome/browser/sync/sessions/session_data_type_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_unittest.cc

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

index f4879fbbf61464eb770e9f813a55f9453b3213f3..412be896ed9fa6396d4d263b0021ceb60d5f0ede 100644

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

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

@@ -193,9 +193,9 @@ class ProfileSyncServiceTest : public ::testing::Test {

signin->SetAuthenticatedUsername("test");

ProfileOAuth2TokenService* oauth2_token_service =

ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);

- components_factory_ = new StrictMock<ProfileSyncComponentsFactoryMock>();

+ components_factory_ = new ProfileSyncComponentsFactoryMock();

service_.reset(new ProfileSyncService(

- components_factory_,

+ scoped_ptr<ProfileSyncComponentsFactory>(components_factory_),

profile_,

make_scoped_ptr(new SupervisedUserSigninManagerWrapper(profile_,

signin)),