Index: ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc |
diff --git a/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc b/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc |
index 59aa019b1f1a831f29521f7f001c25ea173d38fb..4a5676a86d948db9598807ab62066a7458641bd1 100644 |
--- a/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc |
+++ b/ios/chrome/browser/prefs/ios_chrome_pref_service_factory.cc |
@@ -15,8 +15,8 @@ |
#include "components/prefs/pref_service.h" |
#include "components/proxy_config/proxy_config_pref_names.h" |
#include "components/search_engines/default_search_pref_migration.h" |
-#include "components/syncable_prefs/pref_service_syncable.h" |
-#include "components/syncable_prefs/pref_service_syncable_factory.h" |
+#include "components/sync_preferences/pref_service_syncable.h" |
+#include "components/sync_preferences/pref_service_syncable_factory.h" |
#include "ios/chrome/browser/application_context.h" |
#include "ios/chrome/browser/prefs/ios_chrome_pref_model_associator_client.h" |
@@ -32,7 +32,7 @@ void HandleReadError(PersistentPrefStore::PrefReadError error) { |
PersistentPrefStore::PREF_READ_ERROR_MAX_ENUM); |
} |
-void PrepareFactory(syncable_prefs::PrefServiceSyncableFactory* factory, |
+void PrepareFactory(sync_preferences::PrefServiceSyncableFactory* factory, |
const base::FilePath& pref_filename, |
base::SequencedTaskRunner* pref_io_task_runner) { |
factory->set_user_prefs(make_scoped_refptr(new JsonPrefStore( |
@@ -49,12 +49,12 @@ std::unique_ptr<PrefService> CreateLocalState( |
const base::FilePath& pref_filename, |
base::SequencedTaskRunner* pref_io_task_runner, |
const scoped_refptr<PrefRegistry>& pref_registry) { |
- syncable_prefs::PrefServiceSyncableFactory factory; |
+ sync_preferences::PrefServiceSyncableFactory factory; |
PrepareFactory(&factory, pref_filename, pref_io_task_runner); |
return factory.Create(pref_registry.get()); |
} |
-std::unique_ptr<syncable_prefs::PrefServiceSyncable> CreateBrowserStatePrefs( |
+std::unique_ptr<sync_preferences::PrefServiceSyncable> CreateBrowserStatePrefs( |
const base::FilePath& browser_state_path, |
base::SequencedTaskRunner* pref_io_task_runner, |
const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry) { |
@@ -63,18 +63,18 @@ std::unique_ptr<syncable_prefs::PrefServiceSyncable> CreateBrowserStatePrefs( |
// preference modifications (as applications are sand-boxed), it can use a |
// simple JsonPrefStore to store them (which is what PrefStoreManager uses |
// on platforms that do not track preference modifications). |
- syncable_prefs::PrefServiceSyncableFactory factory; |
+ sync_preferences::PrefServiceSyncableFactory factory; |
PrepareFactory(&factory, browser_state_path.Append(kPreferencesFilename), |
pref_io_task_runner); |
- std::unique_ptr<syncable_prefs::PrefServiceSyncable> pref_service = |
+ std::unique_ptr<sync_preferences::PrefServiceSyncable> pref_service = |
factory.CreateSyncable(pref_registry.get()); |
ConfigureDefaultSearchPrefMigrationToDictionaryValue(pref_service.get()); |
return pref_service; |
} |
-std::unique_ptr<syncable_prefs::PrefServiceSyncable> |
+std::unique_ptr<sync_preferences::PrefServiceSyncable> |
CreateIncognitoBrowserStatePrefs( |
- syncable_prefs::PrefServiceSyncable* pref_service) { |
+ sync_preferences::PrefServiceSyncable* pref_service) { |
// List of keys that cannot be changed in the user prefs file by the incognito |
// browser state. All preferences that store information about the browsing |
// history or behaviour of the user should have this property. |