Use std::move() instead of .Pass() in remoting/host

remoting/host/it2me/it2me_native_messaging_host.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 "remoting/host/it2me/it2me_native_messaging_host.h"
 
 #include <string>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringize_macros.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
@@ skipping 18 matching lines @@
     {kError, "ERROR"},
     {kInvalidDomainError, "INVALID_DOMAIN_ERROR"},
 };
 
 }  // namespace
 
 It2MeNativeMessagingHost::It2MeNativeMessagingHost(
     scoped_ptr<ChromotingHostContext> context,
     scoped_ptr<It2MeHostFactory> factory)
     : client_(nullptr),
-      host_context_(context.Pass()),
-      factory_(factory.Pass()),
+      host_context_(std::move(context)),
+      factory_(std::move(factory)),
       weak_factory_(this) {
   weak_ptr_ = weak_factory_.GetWeakPtr();
 
   const ServiceUrls* service_urls = ServiceUrls::GetInstance();
   const bool xmpp_server_valid =
       net::ParseHostAndPort(service_urls->xmpp_server_address(),
                             &xmpp_server_config_.host,
                             &xmpp_server_config_.port);
   DCHECK(xmpp_server_valid);
 
@@ skipping 25 matching lines @@
       static_cast<base::DictionaryValue*>(message_value.release()));
 
   // If the client supplies an ID, it will expect it in the response. This
   // might be a string or a number, so cope with both.
   const base::Value* id;
   if (message_dict->Get("id", &id))
     response->Set("id", id->DeepCopy());
 
   std::string type;
   if (!message_dict->GetString("type", &type)) {
-    SendErrorAndExit(response.Pass(), "'type' not found in request.");
+    SendErrorAndExit(std::move(response), "'type' not found in request.");
     return;
   }
 
   response->SetString("type", type + "Response");
 
   if (type == "hello") {
-    ProcessHello(*message_dict, response.Pass());
+    ProcessHello(*message_dict, std::move(response));
   } else if (type == "connect") {
-    ProcessConnect(*message_dict, response.Pass());
+    ProcessConnect(*message_dict, std::move(response));
   } else if (type == "disconnect") {
-    ProcessDisconnect(*message_dict, response.Pass());
+    ProcessDisconnect(*message_dict, std::move(response));
   } else {
-    SendErrorAndExit(response.Pass(), "Unsupported request type: " + type);
+    SendErrorAndExit(std::move(response), "Unsupported request type: " + type);
   }
 }
 
 void It2MeNativeMessagingHost::Start(Client* client) {
   DCHECK(task_runner()->BelongsToCurrentThread());
   client_ = client;
 #if !defined(OS_CHROMEOS)
   log_message_handler_.reset(
       new LogMessageHandler(
           base::Bind(&It2MeNativeMessagingHost::SendMessageToClient,
@@ skipping 13 matching lines @@
     const base::DictionaryValue& message,
     scoped_ptr<base::DictionaryValue> response) const {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   response->SetString("version", STRINGIZE(VERSION));
 
   // This list will be populated when new features are added.
   scoped_ptr<base::ListValue> supported_features_list(new base::ListValue());
   response->Set("supportedFeatures", supported_features_list.release());
 
-  SendMessageToClient(response.Pass());
+  SendMessageToClient(std::move(response));
 }
 
 void It2MeNativeMessagingHost::ProcessConnect(
     const base::DictionaryValue& message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   if (it2me_host_.get()) {
-    SendErrorAndExit(response.Pass(),
+    SendErrorAndExit(std::move(response),
                      "Connect can be called only when disconnected.");
     return;
   }
 
   XmppSignalStrategy::XmppServerConfig xmpp_config = xmpp_server_config_;
 
   if (!message.GetString("userName", &xmpp_config.username)) {
-    SendErrorAndExit(response.Pass(), "'userName' not found in request.");
+    SendErrorAndExit(std::move(response), "'userName' not found in request.");
     return;
   }
 
   std::string auth_service_with_token;
   if (!message.GetString("authServiceWithToken", &auth_service_with_token)) {
-    SendErrorAndExit(response.Pass(),
+    SendErrorAndExit(std::move(response),
                      "'authServiceWithToken' not found in request.");
     return;
   }
 
   // For backward compatibility the webapp still passes OAuth service as part of
   // the authServiceWithToken field. But auth service part is always expected to
   // be set to oauth2.
   const char kOAuth2ServicePrefix[] = "oauth2:";
   if (!base::StartsWith(auth_service_with_token, kOAuth2ServicePrefix,
                         base::CompareCase::SENSITIVE)) {
-    SendErrorAndExit(response.Pass(), "Invalid 'authServiceWithToken': " +
-                                          auth_service_with_token);
+    SendErrorAndExit(std::move(response), "Invalid 'authServiceWithToken': " +
+                                              auth_service_with_token);
     return;
   }
 
   xmpp_config.auth_token =
       auth_service_with_token.substr(strlen(kOAuth2ServicePrefix));
 
 #if !defined(NDEBUG)
   std::string address;
   if (!message.GetString("xmppServerAddress", &address)) {
-    SendErrorAndExit(response.Pass(),
+    SendErrorAndExit(std::move(response),
                      "'xmppServerAddress' not found in request.");
     return;
   }
 
-  if (!net::ParseHostAndPort(
-           address, &xmpp_server_config_.host, &xmpp_server_config_.port)) {
-    SendErrorAndExit(response.Pass(),
+  if (!net::ParseHostAndPort(address, &xmpp_server_config_.host,
+                             &xmpp_server_config_.port)) {
+    SendErrorAndExit(std::move(response),
                      "Invalid 'xmppServerAddress': " + address);
     return;
   }
 
   if (!message.GetBoolean("xmppServerUseTls", &xmpp_server_config_.use_tls)) {
-    SendErrorAndExit(response.Pass(),
+    SendErrorAndExit(std::move(response),
                      "'xmppServerUseTls' not found in request.");
     return;
   }
 
   if (!message.GetString("directoryBotJid", &directory_bot_jid_)) {
-    SendErrorAndExit(response.Pass(),
+    SendErrorAndExit(std::move(response),
                      "'directoryBotJid' not found in request.");
     return;
   }
 #endif  // !defined(NDEBUG)
 
   // Create the It2Me host and start connecting.
   it2me_host_ = factory_->CreateIt2MeHost(host_context_->Copy(),
                                           weak_ptr_,
                                           xmpp_config,
                                           directory_bot_jid_);
   it2me_host_->Connect();
 
-  SendMessageToClient(response.Pass());
+  SendMessageToClient(std::move(response));
 }
 
 void It2MeNativeMessagingHost::ProcessDisconnect(
     const base::DictionaryValue& message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   if (it2me_host_.get()) {
     it2me_host_->Disconnect();
     it2me_host_ = nullptr;
   }
-  SendMessageToClient(response.Pass());
+  SendMessageToClient(std::move(response));
 }
 
 void It2MeNativeMessagingHost::SendErrorAndExit(
     scoped_ptr<base::DictionaryValue> response,
     const std::string& description) const {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   LOG(ERROR) << description;
 
   response->SetString("type", "error");
   response->SetString("description", description);
-  SendMessageToClient(response.Pass());
+  SendMessageToClient(std::move(response));
 
   // Trigger a host shutdown by sending an empty message.
   client_->CloseChannel(std::string());
 }
 
 void It2MeNativeMessagingHost::OnStateChanged(
     It2MeHostState state,
     const std::string& error_message) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
@@ skipping 24 matching lines @@
       // "error" message so that errors that occur before the "connect" message
       // is sent can be communicated.
       message->SetString("type", "error");
       message->SetString("description", error_message);
       break;
 
     default:
       ;
   }
 
-  SendMessageToClient(message.Pass());
+  SendMessageToClient(std::move(message));
 }
 
 void It2MeNativeMessagingHost::OnNatPolicyChanged(bool nat_traversal_enabled) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   scoped_ptr<base::DictionaryValue> message(new base::DictionaryValue());
 
   message->SetString("type", "natPolicyChanged");
   message->SetBoolean("natTraversalEnabled", nat_traversal_enabled);
-  SendMessageToClient(message.Pass());
+  SendMessageToClient(std::move(message));
 }
 
 // Stores the Access Code for the web-app to query.
 void It2MeNativeMessagingHost::OnStoreAccessCode(
     const std::string& access_code,
     base::TimeDelta access_code_lifetime) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   access_code_ = access_code;
   access_code_lifetime_ = access_code_lifetime;
@@ skipping 12 matching lines @@
   return host_context_->ui_task_runner();
 }
 
 /* static */
 std::string It2MeNativeMessagingHost::HostStateToString(
     It2MeHostState host_state) {
   return ValueToName(kIt2MeHostStates, host_state);
 }
 
 }  // namespace remoting