Remove ScopedVector from chrome/browser/.

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

Index: chrome/browser/sync/test/integration/sync_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 8c53b5475ab84b56cb2dbcdc950118f3c060c2ad..6dab14a335e15523f601ab322a47bb97b964cbea 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -468,7 +468,14 @@ ProfileSyncServiceHarness* SyncTest::GetClient(int index) {
     LOG(FATAL) << "SetupClients() has not yet been called.";
   if (index < 0 || index >= static_cast<int>(clients_.size()))
     LOG(FATAL) << "GetClient(): Index is out of bounds.";
-  return clients_[index];
+  return clients_[index].get();
+}
+
+std::vector<ProfileSyncServiceHarness*> SyncTest::GetSyncClients() {
+  std::vector<ProfileSyncServiceHarness*> clients(clients_.size());
+  for (size_t i = 0; i < clients_.size(); ++i)
+    clients[i] = clients_[i].get();
+  return clients;
 }
 
 ProfileSyncService* SyncTest::GetSyncService(int index) {
@@ -585,6 +592,7 @@ void SyncTest::InitializeProfile(int index, Profile* profile) {
           ? ProfileSyncServiceHarness::SigninType::UI_SIGNIN
           : ProfileSyncServiceHarness::SigninType::FAKE_SIGNIN;
 
+  clients_[index].release();

[Avi (use Gerrit), 2017/03/23 02:44:48]

Is this right? I know that this preserves the code's behavior, but making it
explicit like this exposes the wat.

[leonhsl(Using Gerrit), 2017/03/23 15:03:17]

Yeah I also felt a little weak here.. After checking around I think we can use a
DCHECK(!clients_[index]) here, original code is not intentionally releasing
ownership of a non-null pointer. WDYT? Thanks.

Also changed to use DCHECK for below 2X.

[skym, 2017/03/23 19:28:05]

I agree that the intention is that each index is written to exactly once.

I don't quite follow why the old code was leaking, was this a quirk of
ScopedVector? I definitely don't think we want to leak. If there was for some
reason already an entry at |index|, I think it should be destructed when
overriden. In this new std::vector<std::unique_ptr<X>> world, will assigning to
|index| correctly destruct the existing object? I don't really think adding a
DCHECK above this really adds anything.

[Avi (use Gerrit), 2017/03/23 19:36:33]

Yes. If you assigned through operator[] of ScopedVector it would not delete the
old value. If this is not intentional, and the old code was *accidentally*
leaking, we can fix it.

We just wanted to check to see if for some reason it was intentional.
Yes. If that's the desired behavior (and it seems like it was the behavior you
were expecting and not getting) we can switch to it.

[Nicolas Zea, 2017/03/23 20:06:47]

Agreed with Sky. I'm fairly sure this wasn't intentionally leaking, and was just
an oversight.

   clients_[index] =
       ProfileSyncServiceHarness::Create(GetProfile(index),
                                         username_,
@@ -629,9 +637,10 @@ void SyncTest::InitializeInvalidations(int index) {
                                 GetInvalidationService());
     p2p_invalidation_service->UpdateCredentials(username_, password_);
     // Start listening for and emitting notifications of commits.
+    invalidation_forwarders_[index].release();

[Avi (use Gerrit), 2017/03/23 02:44:48]

ditto

     invalidation_forwarders_[index] =
-        new P2PInvalidationForwarder(clients_[index]->service(),
-                                     p2p_invalidation_service);
+        base::MakeUnique<P2PInvalidationForwarder>(clients_[index]->service(),
+                                                   p2p_invalidation_service);
   }
 }
 
@@ -687,8 +696,9 @@ bool SyncTest::SetupSync() {
   // client set up.
   if (UsingExternalServers()) {
     for (int i = 0; i < num_clients_; ++i) {
-      sync_refreshers_[i] =
-          new P2PSyncRefresher(GetProfile(i), clients_[i]->service());
+      sync_refreshers_[i].release();

[Avi (use Gerrit), 2017/03/23 02:44:48]

ditto

+      sync_refreshers_[i] = base::MakeUnique<P2PSyncRefresher>(
+          GetProfile(i), clients_[i]->service());
     }
 
     // OneClickSigninSyncStarter observer is created with a real user sign in.
@@ -1084,7 +1094,7 @@ bool SyncTest::AwaitEncryptionComplete(int index) {
 }
 
 bool SyncTest::AwaitQuiescence() {
-  return ProfileSyncServiceHarness::AwaitQuiescence(clients());
+  return ProfileSyncServiceHarness::AwaitQuiescence(GetSyncClients());
 }
 
 bool SyncTest::UsingExternalServers() {