chrome/browser/ui/sync/one_click_signin_helper_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/ui/sync/one_click_signin_helper_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/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm ('k') | chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/sync/one_click_signin_helper_unittest.cc

diff --git a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc

index 924cea50166c1531e48e490a4e21f02825afcafb..8b9387acce80297acae01a2c7f4b5aaa1f114d79 100644

--- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc

+++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc

@@ -23,6 +23,7 @@

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

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

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

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

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

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

#include "chrome/browser/ui/sync/one_click_signin_helper.h"

@@ -202,7 +203,8 @@ class OneClickTestProfileSyncService : public TestProfileSyncService {

private:

explicit OneClickTestProfileSyncService(Profile* profile)

: TestProfileSyncService(

- NULL,

+ scoped_ptr<ProfileSyncComponentsFactory>(

+ new ProfileSyncComponentsFactoryMock()),

profile,

SigninManagerFactory::GetForProfile(profile),

ProfileOAuth2TokenServiceFactory::GetForProfile(profile),