components/password_manager: scoped_ptr -> unique_ptr

components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc

Index: components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc
diff --git a/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc b/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc
index 889506b94c75d7227af64928eb5432fbb85e26bd..7079598836cd9d4c9d14ec660ea8a92ccf29567b 100644
--- a/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc
+++ b/components/password_manager/sync/browser/password_manager_setting_migrator_service_unittest.cc
@@ -116,10 +116,11 @@ void StartSyncingPref(syncable_prefs::PrefServiceSyncable* prefs,
     type = syncer::PRIORITY_PREFERENCES;
   ASSERT_NE(syncer::UNSPECIFIED, type) << "Wrong preference name: " << name;
   syncer::SyncableService* sync = prefs->GetSyncableService(type);
-  sync->MergeDataAndStartSyncing(
-      type, sync_data_list, scoped_ptr<syncer::SyncChangeProcessor>(
-                                new syncer::FakeSyncChangeProcessor),
-      scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock));
+  sync->MergeDataAndStartSyncing(type, sync_data_list,
+                                 std::unique_ptr<syncer::SyncChangeProcessor>(
+                                     new syncer::FakeSyncChangeProcessor),
+                                 std::unique_ptr<syncer::SyncErrorFactory>(
+                                     new syncer::SyncErrorFactoryMock));
 }
 
 class SyncServiceMock : public sync_driver::FakeSyncService {
@@ -188,7 +189,7 @@ class PasswordManagerSettingMigratorServiceTest : public testing::Test {
         new user_prefs::PrefRegistrySyncable);
     password_manager::PasswordManager::RegisterProfilePrefs(
         pref_registry.get());
-    scoped_ptr<syncable_prefs::PrefServiceSyncable> pref_service_syncable =
+    std::unique_ptr<syncable_prefs::PrefServiceSyncable> pref_service_syncable =
         factory.CreateSyncable(pref_registry.get());
     migration_service_.reset(
         new PasswordManagerSettingMigratorService(pref_service_syncable.get()));
@@ -217,11 +218,11 @@ class PasswordManagerSettingMigratorServiceTest : public testing::Test {
   }
 
  private:
-  scoped_ptr<base::FieldTrialList> field_trial_list_;
+  std::unique_ptr<base::FieldTrialList> field_trial_list_;
   TestPrefModelAssociatorClient client_;
   SyncServiceMock sync_service_;
-  scoped_ptr<syncable_prefs::PrefServiceSyncable> pref_service_;
-  scoped_ptr<PasswordManagerSettingMigratorService> migration_service_;
+  std::unique_ptr<syncable_prefs::PrefServiceSyncable> pref_service_;
+  std::unique_ptr<PasswordManagerSettingMigratorService> migration_service_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordManagerSettingMigratorServiceTest);
 };