Index: chrome/browser/prefs/pref_service_syncable_util.cc |
diff --git a/chrome/browser/prefs/pref_service_syncable_util.cc b/chrome/browser/prefs/pref_service_syncable_util.cc |
index 68bf0e00e562105053fd4845838bab0d77c30908..01f0b3d169cbbdc13a62d31a65249451ff52023a 100644 |
--- a/chrome/browser/prefs/pref_service_syncable_util.cc |
+++ b/chrome/browser/prefs/pref_service_syncable_util.cc |
@@ -10,25 +10,26 @@ |
#include "build/build_config.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/common/pref_names.h" |
-#include "components/syncable_prefs/pref_service_syncable.h" |
+#include "components/sync_preferences/pref_service_syncable.h" |
#if defined(OS_ANDROID) |
#include "components/proxy_config/proxy_config_pref_names.h" |
#endif |
-syncable_prefs::PrefServiceSyncable* PrefServiceSyncableFromProfile( |
+sync_preferences::PrefServiceSyncable* PrefServiceSyncableFromProfile( |
Profile* profile) { |
- return static_cast<syncable_prefs::PrefServiceSyncable*>(profile->GetPrefs()); |
+ return static_cast<sync_preferences::PrefServiceSyncable*>( |
+ profile->GetPrefs()); |
} |
-syncable_prefs::PrefServiceSyncable* PrefServiceSyncableIncognitoFromProfile( |
+sync_preferences::PrefServiceSyncable* PrefServiceSyncableIncognitoFromProfile( |
Profile* profile) { |
- return static_cast<syncable_prefs::PrefServiceSyncable*>( |
+ return static_cast<sync_preferences::PrefServiceSyncable*>( |
profile->GetOffTheRecordPrefs()); |
} |
-syncable_prefs::PrefServiceSyncable* CreateIncognitoPrefServiceSyncable( |
- syncable_prefs::PrefServiceSyncable* pref_service, |
+sync_preferences::PrefServiceSyncable* CreateIncognitoPrefServiceSyncable( |
+ sync_preferences::PrefServiceSyncable* pref_service, |
PrefStore* incognito_extension_pref_store) { |
// List of keys that cannot be changed in the user prefs file by the incognito |
// profile. All preferences that store information about the browsing history |