| 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 ab739a44a6a3648010d1e57ce9abe7b1f60af91f..d9c0401e37cc3c080ad2a2f8d8ce40dcf479dd66 100644
|
| --- a/chrome/browser/extensions/extension_service_test_base.cc
|
| +++ b/chrome/browser/extensions/extension_service_test_base.cc
|
| @@ -44,7 +44,7 @@ namespace {
|
| const int kThreadOptions = content::TestBrowserThreadBundle::IO_MAINLOOP;
|
|
|
| // Create a testing profile according to |params|.
|
| -scoped_ptr<TestingProfile> BuildTestingProfile(
|
| +std::unique_ptr<TestingProfile> BuildTestingProfile(
|
| const ExtensionServiceTestBase::ExtensionServiceInitParams& params) {
|
| TestingProfile::Builder profile_builder;
|
| // Create a PrefService that only contains user defined preference values.
|
| @@ -56,7 +56,7 @@ scoped_ptr<TestingProfile> BuildTestingProfile(
|
| base::ThreadTaskRunnerHandle::Get().get());
|
| scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
|
| new user_prefs::PrefRegistrySyncable);
|
| - scoped_ptr<syncable_prefs::PrefServiceSyncable> prefs(
|
| + std::unique_ptr<syncable_prefs::PrefServiceSyncable> prefs(
|
| factory.CreateSyncable(registry.get()));
|
| chrome::RegisterUserProfilePrefs(registry.get());
|
| profile_builder.SetPrefService(std::move(prefs));
|
|
|