Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: chrome/browser/sync/chrome_sync_client.cc

Issue 1326353002: Remove dependency of PrefSyncableService on Profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_model_associator
Patch Set: Move files back to //chrome/browser/prefs & //chrome/test/base 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/sync/chrome_sync_client.cc
diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc
index 1fd2f0bbe140e94955c1b36056d288323111ee4a..67fcb0b340ebba410ccbd70b87584c8c7a05c61c 100644
--- a/chrome/browser/sync/chrome_sync_client.cc
+++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/password_manager/password_store_factory.h"
#include "chrome/browser/prefs/pref_service_syncable.h"
+#include "chrome/browser/prefs/pref_service_syncable_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/sync/profile_sync_components_factory_impl.h"
@@ -136,11 +137,13 @@ ChromeSyncClient::GetSyncableServiceForType(syncer::ModelType type) {
->GetDeviceInfoSyncableService()
->AsWeakPtr();
case syncer::PREFERENCES:
- return PrefServiceSyncable::FromProfile(
- profile_)->GetSyncableService(syncer::PREFERENCES)->AsWeakPtr();
+ return PrefServiceSyncableFromProfile(profile_)
+ ->GetSyncableService(syncer::PREFERENCES)
+ ->AsWeakPtr();
case syncer::PRIORITY_PREFERENCES:
- return PrefServiceSyncable::FromProfile(profile_)->GetSyncableService(
- syncer::PRIORITY_PREFERENCES)->AsWeakPtr();
+ return PrefServiceSyncableFromProfile(profile_)
+ ->GetSyncableService(syncer::PRIORITY_PREFERENCES)
+ ->AsWeakPtr();
case syncer::AUTOFILL:
case syncer::AUTOFILL_PROFILE:
case syncer::AUTOFILL_WALLET_DATA:

Powered by Google App Engine
This is Rietveld 408576698