Global conversion of Pass()→std::move(): Linux GN static library edition

components/devtools_service/devtools_http_server.cc

Index: components/devtools_service/devtools_http_server.cc
diff --git a/components/devtools_service/devtools_http_server.cc b/components/devtools_service/devtools_http_server.cc
index c3848cbce19dc0bd9d6e0505ff9824e3b41ec3e0..28dff655bb63f2a79c649bd5d4aa26f071a54d8b 100644
--- a/components/devtools_service/devtools_http_server.cc
+++ b/components/devtools_service/devtools_http_server.cc
@@ -6,8 +6,8 @@
 
 #include <stddef.h>
 #include <string.h>
-
 #include <string>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
@@ -103,13 +103,13 @@ mojo::HttpResponsePtr MakeResponse(uint32_t status_code,
     options.element_num_bytes = 1;
     options.capacity_num_bytes = num_bytes;
     mojo::DataPipe data_pipe(options);
-    response->body = data_pipe.consumer_handle.Pass();
+    response->body = std::move(data_pipe.consumer_handle);
     MojoResult result =
         WriteDataRaw(data_pipe.producer_handle.get(), body.data(), &num_bytes,
                      MOJO_WRITE_DATA_FLAG_ALL_OR_NONE);
     CHECK_EQ(MOJO_RESULT_OK, result);
   }
-  return response.Pass();
+  return response;
 }
 
 mojo::HttpResponsePtr MakeJsonResponse(uint32_t status_code,
@@ -146,9 +146,9 @@ class WebSocketRelayer : public DevToolsAgentHost::Delegate,
     DCHECK(send_stream.is_valid());
 
     mojo::WebSocketClientPtr web_socket_client;
-    new WebSocketRelayer(agent_host, web_socket.Pass(), send_stream.Pass(),
-                         &web_socket_client);
-    return web_socket_client.Pass();
+    new WebSocketRelayer(agent_host, std::move(web_socket),
+                         std::move(send_stream), &web_socket_client);
+    return web_socket_client;
   }
 
  private:
@@ -158,8 +158,8 @@ class WebSocketRelayer : public DevToolsAgentHost::Delegate,
                    mojo::WebSocketClientPtr* web_socket_client)
       : agent_host_(agent_host),
         binding_(this, web_socket_client),
-        web_socket_(web_socket.Pass()),
-        send_stream_(send_stream.Pass()),
+        web_socket_(std::move(web_socket)),
+        send_stream_(std::move(send_stream)),
         write_send_stream_(new mojo::WebSocketWriteQueue(send_stream_.get())),
         pending_send_count_(0),
         pending_receive_count_(0) {
@@ -208,7 +208,7 @@ class WebSocketRelayer : public DevToolsAgentHost::Delegate,
   void DidConnect(const mojo::String& selected_subprotocol,
                   const mojo::String& extensions,
                   mojo::ScopedDataPipeConsumerHandle receive_stream) override {
-    receive_stream_ = receive_stream.Pass();
+    receive_stream_ = std::move(receive_stream);
     read_receive_stream_.reset(
         new mojo::WebSocketReadQueue(receive_stream_.get()));
   }
@@ -298,8 +298,8 @@ class DevToolsHttpServer::HttpConnectionDelegateImpl
       mojo::HttpConnectionPtr connection,
       mojo::InterfaceRequest<HttpConnectionDelegate> delegate_request)
       : owner_(owner),
-        connection_(connection.Pass()),
-        binding_(this, delegate_request.Pass()) {
+        connection_(std::move(connection)),
+        binding_(this, std::move(delegate_request)) {
     DCHECK(owner_);
     DCHECK(connection_);
     DCHECK(binding_.is_bound());
@@ -315,13 +315,13 @@ class DevToolsHttpServer::HttpConnectionDelegateImpl
   // mojo::HttpConnectionDelegate implementation:
   void OnReceivedRequest(mojo::HttpRequestPtr request,
                          const OnReceivedRequestCallback& callback) override {
-    owner_->OnReceivedRequest(this, request.Pass(), callback);
+    owner_->OnReceivedRequest(this, std::move(request), callback);
   }
 
   void OnReceivedWebSocketRequest(
       mojo::HttpRequestPtr request,
       const OnReceivedWebSocketRequestCallback& callback) override {
-    owner_->OnReceivedWebSocketRequest(this, request.Pass(), callback);
+    owner_->OnReceivedWebSocketRequest(this, std::move(request), callback);
   }
 
   DevToolsHttpServer* const owner_;
@@ -354,7 +354,7 @@ DevToolsHttpServer::DevToolsHttpServer(DevToolsService* service,
   http_server_delegate_binding_.reset(
       new mojo::Binding<mojo::HttpServerDelegate>(this, &http_server_delegate));
   network_service->CreateHttpServer(
-      local_address.Pass(), http_server_delegate.Pass(),
+      std::move(local_address), std::move(http_server_delegate),
       mojo::NetworkService::CreateHttpServerCallback());
 }
 
@@ -365,8 +365,8 @@ DevToolsHttpServer::~DevToolsHttpServer() {
 void DevToolsHttpServer::OnConnected(
     mojo::HttpConnectionPtr connection,
     mojo::InterfaceRequest<mojo::HttpConnectionDelegate> delegate) {
-  connections_.insert(
-      new HttpConnectionDelegateImpl(this, connection.Pass(), delegate.Pass()));
+  connections_.insert(new HttpConnectionDelegateImpl(
+      this, std::move(connection), std::move(delegate)));
 }
 
 void DevToolsHttpServer::OnReceivedRequest(
@@ -376,9 +376,9 @@ void DevToolsHttpServer::OnReceivedRequest(
   DCHECK(connections_.find(connection) != connections_.end());
 
   if (request->url.get().find(kJsonRequestUrlPrefix) == 0) {
-    mojo::HttpResponsePtr response = ProcessJsonRequest(request.Pass());
+    mojo::HttpResponsePtr response = ProcessJsonRequest(std::move(request));
     if (response)
-      callback.Run(response.Pass());
+      callback.Run(std::move(response));
     else
       OnConnectionClosed(connection);
   } else {
@@ -421,9 +421,10 @@ void DevToolsHttpServer::OnReceivedWebSocketRequest(
       mojo::GetProxy(&web_socket);
   mojo::DataPipe data_pipe;
   mojo::WebSocketClientPtr web_socket_client = WebSocketRelayer::SetUp(
-      agent, web_socket.Pass(), data_pipe.producer_handle.Pass());
-  callback.Run(web_socket_request.Pass(), data_pipe.consumer_handle.Pass(),
-               web_socket_client.Pass());
+      agent, std::move(web_socket), std::move(data_pipe.producer_handle));
+  callback.Run(std::move(web_socket_request),
+               std::move(data_pipe.consumer_handle),
+               std::move(web_socket_client));
 }
 
 void DevToolsHttpServer::OnConnectionClosed(
@@ -491,7 +492,7 @@ mojo::HttpResponsePtr DevToolsHttpServer::ProcessJsonRequest(
           kTargetWebSocketDebuggerUrlField,
           base::StringPrintf("ws://%s%s%s", host.c_str(), kPageUrlPrefix,
                              iter.value()->id().c_str()));
-      list_value.Append(dict_value.Pass());
+      list_value.Append(std::move(dict_value));
     }
     return MakeJsonResponse(200, &list_value, std::string());
   }