| Index: chrome/browser/extensions/extension_service_test_base.cc
|
| diff --git a/chrome/browser/extensions/extension_service_test_base.cc b/chrome/browser/extensions/extension_service_test_base.cc
|
| index c2f6fe47f47c9d9e1ce7ccb1a46894b7d7158104..3179878acb208ef17e6ce569d637bc66938a43d2 100644
|
| --- a/chrome/browser/extensions/extension_service_test_base.cc
|
| +++ b/chrome/browser/extensions/extension_service_test_base.cc
|
| @@ -27,8 +27,8 @@
|
| #include "chrome/test/base/testing_browser_process.h"
|
| #include "chrome/test/base/testing_profile.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| -#include "components/syncable_prefs/pref_service_mock_factory.h"
|
| -#include "components/syncable_prefs/pref_service_syncable.h"
|
| +#include "components/sync_preferences/pref_service_mock_factory.h"
|
| +#include "components/sync_preferences/pref_service_syncable.h"
|
| #include "content/public/browser/browser_context.h"
|
| #include "extensions/browser/extension_prefs.h"
|
| #include "extensions/browser/extension_registry.h"
|
| @@ -49,15 +49,15 @@ std::unique_ptr<TestingProfile> BuildTestingProfile(
|
| const ExtensionServiceTestBase::ExtensionServiceInitParams& params) {
|
| TestingProfile::Builder profile_builder;
|
| // Create a PrefService that only contains user defined preference values.
|
| - syncable_prefs::PrefServiceMockFactory factory;
|
| + sync_preferences::PrefServiceMockFactory factory;
|
| // If pref_file is empty, TestingProfile automatically creates
|
| - // syncable_prefs::TestingPrefServiceSyncable instance.
|
| + // sync_preferences::TestingPrefServiceSyncable instance.
|
| if (!params.pref_file.empty()) {
|
| factory.SetUserPrefsFile(params.pref_file,
|
| base::ThreadTaskRunnerHandle::Get().get());
|
| scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
|
| new user_prefs::PrefRegistrySyncable);
|
| - std::unique_ptr<syncable_prefs::PrefServiceSyncable> prefs(
|
| + std::unique_ptr<sync_preferences::PrefServiceSyncable> prefs(
|
| factory.CreateSyncable(registry.get()));
|
| chrome::RegisterUserProfilePrefs(registry.get());
|
| profile_builder.SetPrefService(std::move(prefs));
|
|
|