Convert Pass()→std::move() in //chrome

chrome/test/chromedriver/chrome_launcher.cc

Index: chrome/test/chromedriver/chrome_launcher.cc
diff --git a/chrome/test/chromedriver/chrome_launcher.cc b/chrome/test/chromedriver/chrome_launcher.cc
index a7c2a47b5fd734a73a5843d565c33ea5a71964d8..d178fd87505c06eeaedbbc3b3eb117ba34a295f5 100644
--- a/chrome/test/chromedriver/chrome_launcher.cc
+++ b/chrome/test/chromedriver/chrome_launcher.cc
@@ -6,8 +6,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
-
 #include <algorithm>
+#include <utility>
 #include <vector>
 
 #include "base/base64.h"
@@ -196,9 +196,9 @@ Status WaitForDevToolsAndCheckVersion(
     window_types.reset(new std::set<WebViewInfo::Type>());
   }
 
-  scoped_ptr<DevToolsHttpClient> client(
-      new DevToolsHttpClient(address, context_getter, socket_factory,
-                             device_metrics.Pass(), window_types.Pass()));
+  scoped_ptr<DevToolsHttpClient> client(new DevToolsHttpClient(
+      address, context_getter, socket_factory, std::move(device_metrics),
+      std::move(window_types)));
   base::TimeTicks deadline =
       base::TimeTicks::Now() + base::TimeDelta::FromSeconds(60);
   Status status = client->Init(deadline - base::TimeTicks::Now());
@@ -221,7 +221,7 @@ Status WaitForDevToolsAndCheckVersion(
     client->GetWebViewsInfo(&views_info);
     for (size_t i = 0; i < views_info.GetSize(); ++i) {
       if (views_info.Get(i).type == WebViewInfo::kPage) {
-        *user_client = client.Pass();
+        *user_client = std::move(client);
         return Status(kOk);
       }
     }
@@ -253,7 +253,7 @@ Status CreateBrowserwideDevToolsClientAndConnect(
   // Provide the client regardless of whether it connects, so that Chrome always
   // has a valid |devtools_websocket_client_|. If not connected, no listeners
   // will be notified, and client will just return kDisconnected errors if used.
-  *browser_client = client.Pass();
+  *browser_client = std::move(client);
   // To avoid unnecessary overhead, only connect if tracing is enabled, since
   // the browser-wide client is currently only used for tracing.
   if (!perf_logging_prefs.trace_categories.empty()) {
@@ -290,8 +290,8 @@ Status LaunchRemoteChromeSession(
                  << status.message();
   }
 
-  chrome->reset(new ChromeRemoteImpl(devtools_http_client.Pass(),
-                                     devtools_websocket_client.Pass(),
+  chrome->reset(new ChromeRemoteImpl(std::move(devtools_http_client),
+                                     std::move(devtools_websocket_client),
                                      *devtools_event_listeners));
   return Status(kOk);
 }
@@ -426,15 +426,10 @@ Status LaunchDesktopChrome(
                  << status.message();
   }
 
-  scoped_ptr<ChromeDesktopImpl> chrome_desktop(
-      new ChromeDesktopImpl(devtools_http_client.Pass(),
-                            devtools_websocket_client.Pass(),
-                            *devtools_event_listeners,
-                            port_reservation.Pass(),
-                            process.Pass(),
-                            command,
-                            &user_data_dir,
-                            &extension_dir));
+  scoped_ptr<ChromeDesktopImpl> chrome_desktop(new ChromeDesktopImpl(
+      std::move(devtools_http_client), std::move(devtools_websocket_client),
+      *devtools_event_listeners, std::move(port_reservation),
+      std::move(process), command, &user_data_dir, &extension_dir));
   for (size_t i = 0; i < extension_bg_pages.size(); ++i) {
     VLOG(0) << "Waiting for extension bg page load: " << extension_bg_pages[i];
     scoped_ptr<WebView> web_view;
@@ -447,7 +442,7 @@ Status LaunchDesktopChrome(
                     status);
     }
   }
-  *chrome = chrome_desktop.Pass();
+  *chrome = std::move(chrome_desktop);
   return Status(kOk);
 }
 
@@ -507,11 +502,10 @@ Status LaunchAndroidChrome(
                  << status.message();
   }
 
-  chrome->reset(new ChromeAndroidImpl(devtools_http_client.Pass(),
-                                      devtools_websocket_client.Pass(),
-                                      *devtools_event_listeners,
-                                      port_reservation.Pass(),
-                                      device.Pass()));
+  chrome->reset(new ChromeAndroidImpl(
+      std::move(devtools_http_client), std::move(devtools_websocket_client),
+      *devtools_event_listeners, std::move(port_reservation),
+      std::move(device)));
   return Status(kOk);
 }
 
@@ -544,14 +538,9 @@ Status LaunchChrome(
     if (port_status.IsError())
       return Status(kUnknownError, "cannot reserve port for Chrome",
                     port_status);
-    return LaunchAndroidChrome(context_getter,
-                               port,
-                               port_reservation.Pass(),
-                               socket_factory,
-                               capabilities,
-                               devtools_event_listeners,
-                               device_manager,
-                               chrome);
+    return LaunchAndroidChrome(
+        context_getter, port, std::move(port_reservation), socket_factory,
+        capabilities, devtools_event_listeners, device_manager, chrome);
   } else {
     if (port_server)
       port_status = port_server->ReservePort(&port, &port_reservation);
@@ -560,13 +549,9 @@ Status LaunchChrome(
     if (port_status.IsError())
       return Status(kUnknownError, "cannot reserve port for Chrome",
                     port_status);
-    return LaunchDesktopChrome(context_getter,
-                               port,
-                               port_reservation.Pass(),
-                               socket_factory,
-                               capabilities,
-                               devtools_event_listeners,
-                               chrome);
+    return LaunchDesktopChrome(context_getter, port,
+                               std::move(port_reservation), socket_factory,
+                               capabilities, devtools_event_listeners, chrome);
   }
 }