Convert //tools to use std::unique_ptr

tools/android/forwarder2/forwarders_manager.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 "tools/android/forwarder2/forwarders_manager.h"
 
 #include <stddef.h>
 #include <sys/select.h>
 #include <unistd.h>
 #include <algorithm>
@@ skipping 13 matching lines @@
 ForwardersManager::ForwardersManager() : thread_("ForwardersManagerThread") {
   thread_.Start();
   WaitForEventsOnInternalThreadSoon();
 }
 
 
 ForwardersManager::~ForwardersManager() {
   deletion_notifier_.Notify();
 }
 
-void ForwardersManager::CreateAndStartNewForwarder(scoped_ptr<Socket> socket1,
-                                                   scoped_ptr<Socket> socket2) {
+void ForwardersManager::CreateAndStartNewForwarder(
+    std::unique_ptr<Socket> socket1,
+    std::unique_ptr<Socket> socket2) {
   // Note that the internal Forwarder vector is populated on the internal thread
   // which is the only thread from which it's accessed.
   thread_.task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&ForwardersManager::CreateNewForwarderOnInternalThread,
                  base::Unretained(this), base::Passed(&socket1),
                  base::Passed(&socket2)));
 
   // Guarantees that the CreateNewForwarderOnInternalThread callback posted to
   // the internal thread gets executed immediately.
   wakeup_notifier_.Notify();
 }
 
 void ForwardersManager::CreateNewForwarderOnInternalThread(
-    scoped_ptr<Socket> socket1,
-    scoped_ptr<Socket> socket2) {
+    std::unique_ptr<Socket> socket1,
+    std::unique_ptr<Socket> socket2) {
   DCHECK(thread_.task_runner()->RunsTasksOnCurrentThread());
   forwarders_.push_back(new Forwarder(std::move(socket1), std::move(socket2)));
 }
 
 void ForwardersManager::WaitForEventsOnInternalThreadSoon() {
   thread_.task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&ForwardersManager::WaitForEventsOnInternalThread,
                  base::Unretained(this)));
 }
@@ skipping 61 matching lines @@
       ++i;
       continue;
     }
 
     std::swap(forwarders_[i], forwarders_.back());
     forwarders_.pop_back();
   }
 }
 
 }  // namespace forwarder2