chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc - Issue 1326353002: Remove dependency of PrefSyncableService on Profile.

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/prefs/synced_pref_change_registrar_browsertest.cc

Issue 1326353002: Remove dependency of PrefSyncableService on Profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_model_associator

Patch Set: Fixing ChromeOS and Linux compilation Created 5 years, 3 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

Index: chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc

diff --git a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc

index af9a3618807471c29c728c829ce3fe99aaa995be..3264a9e775b44fc7299398f6667f4b5ec540dfd5 100644

--- a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc

+++ b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc

@@ -8,6 +8,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/time/time.h"

#include "base/values.h"

+#include "chrome/browser/prefs/pref_service_syncable_util.h"

#include "chrome/browser/prefs/synced_pref_change_registrar.h"

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

#include "chrome/common/pref_names.h"

@@ -103,7 +104,7 @@ class SyncedPrefChangeRegistrarTest : public InProcessBrowserTest {

#endif

void SetUpOnMainThread() override {

- prefs_ = PrefServiceSyncable::FromProfile(browser()->profile());

+ prefs_ = PrefServiceSyncableFromProfile(browser()->profile());

syncer_ = prefs_->GetSyncableService(syncer::PREFERENCES);

syncer_->MergeDataAndStartSyncing(

syncer::PREFERENCES,

« no previous file with comments | « chrome/browser/prefs/pref_service_syncable_util.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »