Remove ScopedVector from tools/android/.

tools/android/forwarder2/forwarders_manager.cc

Index: tools/android/forwarder2/forwarders_manager.cc
diff --git a/tools/android/forwarder2/forwarders_manager.cc b/tools/android/forwarder2/forwarders_manager.cc
index e8b573f0ddb74e91e946cbd3403a588dd4a50612..941c4243ec1b7d68dbd8e48c7e65222f864b20fb 100644
--- a/tools/android/forwarder2/forwarders_manager.cc
+++ b/tools/android/forwarder2/forwarders_manager.cc
@@ -15,6 +15,7 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/posix/eintr_wrapper.h"
 #include "tools/android/forwarder2/forwarder.h"
 #include "tools/android/forwarder2/socket.h"
@@ -51,7 +52,8 @@ void ForwardersManager::CreateNewForwarderOnInternalThread(
     std::unique_ptr<Socket> socket1,
     std::unique_ptr<Socket> socket2) {
   DCHECK(thread_.task_runner()->RunsTasksInCurrentSequence());
-  forwarders_.push_back(new Forwarder(std::move(socket1), std::move(socket2)));
+  forwarders_.push_back(
+      base::MakeUnique<Forwarder>(std::move(socket1), std::move(socket2)));
 }
 
 void ForwardersManager::WaitForEventsOnInternalThreadSoon() {
@@ -71,11 +73,8 @@ void ForwardersManager::WaitForEventsOnInternalThread() {
 
   // Populate the file descriptor sets.
   int max_fd = -1;
-  for (ScopedVector<Forwarder>::iterator it = forwarders_.begin();
-       it != forwarders_.end(); ++it) {
-    Forwarder* const forwarder = *it;
+  for (const auto& forwarder : forwarders_)
     forwarder->RegisterFDs(&read_fds, &write_fds, &max_fd);
-  }
 
   const int notifier_fds[] = {
     wakeup_notifier_.receiver_fd(),
@@ -114,7 +113,7 @@ void ForwardersManager::WaitForEventsOnInternalThread() {
 
   // Notify the Forwarder instances and remove the ones that are closed.
   for (size_t i = 0; i < forwarders_.size(); ) {
-    Forwarder* const forwarder = forwarders_[i];
+    Forwarder* const forwarder = forwarders_[i].get();
     forwarder->ProcessEvents(read_fds, write_fds);
 
     if (must_shutdown)