chrome/browser/extensions/external_provider_impl_chromeos_unittest.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/extensions/external_provider_impl_chromeos_unittest.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

« no previous file with comments | « chrome/browser/extensions/external_pref_loader.cc ('k') | chrome/browser/notifications/extension_welcome_notification.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc

diff --git a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc

index 809e2e9f65939c968a4fa7cf3223293e0a0ebfce..7a5ca87d4e15f18df513aa746e750672c8ea634c 100644

--- a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc

+++ b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc

@@ -14,6 +14,7 @@

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_service_test_base.h"

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

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

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

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

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

@@ -192,7 +193,7 @@ TEST_F(ExternalProviderImplChromeOSTest, PriorityCompleted) {

service_->CheckForExternalUpdates();

// Priority sync completed.

- PrefServiceSyncable::FromProfile(profile_.get())

+ PrefServiceSyncableFromProfile(profile_.get())

->GetSyncableService(syncer::PRIORITY_PREFERENCES)

->MergeDataAndStartSyncing(syncer::PRIORITY_PREFERENCES,

syncer::SyncDataList(),