Remove ScopedVector from chrome/browser/.

chrome/browser/sync/test/integration/migration_test.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <memory>
+#include <vector>
+
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
+#include "base/memory/ptr_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/migration_waiter.h"
 #include "chrome/browser/sync/test/integration/migration_watcher.h"
 #include "chrome/browser/sync/test/integration/preferences_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/common/pref_names.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
@@ skipping 56 matching lines @@
   enum TriggerMethod { MODIFY_PREF, MODIFY_BOOKMARK, TRIGGER_NOTIFICATION };
 
   // Set up sync for all profiles and initialize all MigrationWatchers. This
   // helps ensure that all migration events are captured, even if they were to
   // occur before a test calls AwaitMigration for a specific profile.
   bool SetupSync() override {
     if (!SyncTest::SetupSync())
       return false;
 
     for (int i = 0; i < num_clients(); ++i) {
-      MigrationWatcher* watcher = new MigrationWatcher(GetClient(i));
-      migration_watchers_.push_back(watcher);
+      migration_watchers_.push_back(
+          base::MakeUnique<MigrationWatcher>(GetClient(i)));
     }
     return true;
   }
 
   syncer::ModelTypeSet GetPreferredDataTypes() {
     // ProfileSyncService must already have been created before we can call
     // GetPreferredDataTypes().
     DCHECK(GetSyncService(0));
     syncer::ModelTypeSet preferred_data_types =
         GetSyncService(0)->GetPreferredDataTypes();
@@ skipping 57 matching lines @@
       default:
         ADD_FAILURE();
     }
   }
 
   // Block until all clients have completed migration for the given
   // types.
   void AwaitMigration(syncer::ModelTypeSet migrate_types) {
     for (int i = 0; i < num_clients(); ++i) {
       ASSERT_TRUE(
-          MigrationWaiter(migrate_types, migration_watchers_[i]).Wait());
+          MigrationWaiter(migrate_types, migration_watchers_[i].get()).Wait());
     }
   }
 
   // Makes sure migration works with the given migration list and
   // trigger method.
   void RunMigrationTest(const MigrationList& migration_list,
                         TriggerMethod trigger_method) {
     // If we have only one client, turn off notifications to avoid the
     // possibility of spurious sync cycles.
     bool do_test_without_notifications =
@@ skipping 35 matching lines @@
     if (!do_test_without_notifications) {
       AwaitQuiescence();
     }
 
     // TODO(rlarocque): It should be possible to re-enable notifications
     // here, but doing so makes some windows tests flaky.
   }
 
  private:
   // Used to keep track of the migration progress for each sync client.
-  ScopedVector<MigrationWatcher> migration_watchers_;
+  std::vector<std::unique_ptr<MigrationWatcher>> migration_watchers_;
 
   DISALLOW_COPY_AND_ASSIGN(MigrationTest);
 };
 
 class MigrationSingleClientTest : public MigrationTest {
  public:
   MigrationSingleClientTest() : MigrationTest(SINGLE_CLIENT_LEGACY) {}
   ~MigrationSingleClientTest() override {}
 
   void RunSingleClientMigrationTest(const MigrationList& migration_list,
@@ skipping 195 matching lines @@
     // Do not add optional datatypes.
   }
 
   ~MigrationReconfigureTest() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest);
 };
 
 }  // namespace