chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc - Issue 367153005: 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/extensions/api/preferences_private/preferences_private_apitest.cc

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

Patch Set: Fixed test issues with mocking of 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 | « no previous file | chrome/browser/extensions/api/sessions/sessions_apitest.cc » ('j') | chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc

diff --git a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc

index f64288b69cf7d7a57b5e5d87658a15a111f2dfad..3756a0a695de11d29f75da57b79b7dcf902bcd5b 100644

--- a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc

+++ b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc

@@ -19,6 +19,7 @@

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

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

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

+#include "chrome/browser/sync/profile_sync_components_factory_mock.h"

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

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

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

@@ -42,7 +43,7 @@ class FakeProfileSyncService : public ProfileSyncService {

public:

explicit FakeProfileSyncService(Profile* profile)

: ProfileSyncService(

- NULL,

+ new ProfileSyncComponentsFactoryMock(),

sky 2014/07/14 19:33:34 Can the constructor take a scoped_ptr so that I do

stanisc 2014/07/14 22:49:05 This is a pre-existing issue, but I agree it makes

profile,

make_scoped_ptr<SupervisedUserSigninManagerWrapper>(NULL),

ProfileOAuth2TokenServiceFactory::GetForProfile(profile),