components/signin/ios/browser/account_consistency_service_unittest.mm - Issue 2078893002: Add callback list to PrefModelAssociator after sync data is loaded

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: components/signin/ios/browser/account_consistency_service_unittest.mm

Issue 2078893002: Add callback list to PrefModelAssociator after sync data is loaded (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@migrate_domain_scoped_settings

Patch Set: Created 4 years, 6 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

« components/content_settings/core/browser/host_content_settings_map.cc ('K') | « components/content_settings/core/browser/host_content_settings_map.cc ('k') | components/syncable_prefs/pref_model_associator.h » ('j') | components/syncable_prefs/pref_model_associator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/signin/ios/browser/account_consistency_service_unittest.mm

diff --git a/components/signin/ios/browser/account_consistency_service_unittest.mm b/components/signin/ios/browser/account_consistency_service_unittest.mm

index 984a802ead782b30e30c19e8759681425830449b..0dd8c0f02c70409bc1460db1c85ec2a74e5441f6 100644

--- a/components/signin/ios/browser/account_consistency_service_unittest.mm

+++ b/components/signin/ios/browser/account_consistency_service_unittest.mm

@@ -133,7 +133,8 @@ class AccountConsistencyServiceTest : public PlatformTest {

signin_client_.get(), nullptr, &account_tracker_service_, nullptr));

account_tracker_service_.Initialize(signin_client_.get());

settings_map_ = new HostContentSettingsMap(

- &prefs_, false /* incognito_profile */, false /* guest_profile */);

+ &prefs_, false /* incognito_profile */, false /* guest_profile */,

+ nullptr /* PrefServiceSyncable* */);

raymes 2016/06/29 03:50:01 nit: same here (should just be pref_service)

lshang 2016/06/30 05:03:36 We've changed to not pass in the pointer, so no ne

cookie_settings_ =

new content_settings::CookieSettings(settings_map_.get(), &prefs_, "");

ResetAccountConsistencyService();