Remove ScopedVector from chrome/browser/.

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

 // Copyright 2013 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 "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 
 #include <cstddef>
 #include <iterator>
 #include <ostream>
 #include <sstream>
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/test/integration/quiesce_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
@@ skipping 67 matching lines @@
     // Still waiting on sync setup.
     return false;
   }
 
   std::string GetDebugMessage() const override { return "Sync Setup"; }
 };
 
 }  // namespace
 
 // static
-ProfileSyncServiceHarness* ProfileSyncServiceHarness::Create(
+std::unique_ptr<ProfileSyncServiceHarness> ProfileSyncServiceHarness::Create(
     Profile* profile,
     const std::string& username,
     const std::string& password,
     SigninType signin_type) {
-  return new ProfileSyncServiceHarness(profile,
-                                       username,
-                                       password,
-                                       signin_type);
+  return base::WrapUnique(
+      new ProfileSyncServiceHarness(profile, username, password, signin_type));
 }
 
 ProfileSyncServiceHarness::ProfileSyncServiceHarness(
     Profile* profile,
     const std::string& username,
     const std::string& password,
     SigninType signin_type)
     : profile_(profile),
       service_(ProfileSyncServiceFactory::GetForProfile(profile)),
       username_(username),
@@ skipping 163 matching lines @@
   }
 
   return true;
 }
 
 bool ProfileSyncServiceHarness::AwaitMutualSyncCycleCompletion(
     ProfileSyncServiceHarness* partner) {
   std::vector<ProfileSyncServiceHarness*> harnesses;
   harnesses.push_back(this);
   harnesses.push_back(partner);
-  return AwaitQuiescence(harnesses);
+  return AwaitQuiescence(std::move(harnesses));
 }
 
 bool ProfileSyncServiceHarness::AwaitGroupSyncCycleCompletion(
-    const std::vector<ProfileSyncServiceHarness*>& partners) {
-  return AwaitQuiescence(partners);
+    std::vector<ProfileSyncServiceHarness*> partners) {
+  return AwaitQuiescence(std::move(partners));
 }
 
 // static
 bool ProfileSyncServiceHarness::AwaitQuiescence(
-    const std::vector<ProfileSyncServiceHarness*>& clients) {
+    std::vector<ProfileSyncServiceHarness*> clients) {

[Lei Zhang, 2017/03/23 02:59:26]

Should this remain a const-ref?

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

This function is called by SyncTest::AwaitQuiescence(), which was calling
ScopedVector::get() to obtain the const-ref of vector and then passing it as
parameter to this function. 

But now for SyncTest::AwaitQuiescence(), std::vector<std::unique_ptr<>> has no
such convenient function get() to obtain the const-ref of vector, so I did this
change.

[Nicolas Zea, 2017/03/23 23:10:07]

Isn't GetSyncClients good enough to access a vector from AwaitQuiescence (which
you're already using)? It doesn't seem like this needs std::move logic around it
anywhere, unless I'm missing something?

[leonhsl(Using Gerrit), 2017/03/24 02:23:12]

Sorry if I'm misunderstanding the question, do you mean that we'd better still
make GetSyncClients() to return a const-ref of vector? 
If so, we'd have to keep a vector member in SyncTest class, in corresponding
with that std::vector<std::unique_ptr<X>> member. Personally I'd prefer to
return a vector rather than returning a const-ref of a member vector..

[Nicolas Zea, 2017/03/24 16:48:03]

Why do you need to keep a vector member in SyncTest? GetSyncClients returns a
std::vector<ProfileSyncServiceHarness*> already. You can simply pass the return
value of GetSyncClients by const ref all the way down to AwaitQuiescence right?
Nothing is keeping a reference to that vector within the callstack from what I
can tell.

[leonhsl(Using Gerrit), 2017/03/25 14:41:13]

Ah,, I see, Thank you! Done.

   std::vector<ProfileSyncService*> services;
   if (clients.empty()) {
     return true;
   }
 
   for (const ProfileSyncServiceHarness* harness : clients) {
     services.push_back(harness->service());
   }
   return QuiesceStatusChangeChecker(services).Wait();
 }
@@ skipping 230 matching lines @@
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   std::unique_ptr<base::DictionaryValue> value(
       syncer::sync_ui_util::ConstructAboutInformation(
           service(), service()->signin(), chrome::GetChannel()));
   std::string service_status;
   base::JSONWriter::WriteWithOptions(
       *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &service_status);
   return service_status;
 }