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

remoting/host/setup/me2me_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/setup/me2me_native_messaging_host.h"
 
 #include <string>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/stringize_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 41 matching lines @@
 // Returns nullptr on failure, and logs an error message.
 scoped_ptr<base::DictionaryValue> ConfigDictionaryFromMessage(
     scoped_ptr<base::DictionaryValue> message) {
   scoped_ptr<base::DictionaryValue> result;
   const base::DictionaryValue* config_dict;
   if (message->GetDictionary("config", &config_dict)) {
     result.reset(config_dict->DeepCopy());
   } else {
     LOG(ERROR) << "'config' dictionary not found";
   }
-  return result.Pass();
+  return result;
 }
 
 }  // namespace
 
 namespace remoting {
 
 Me2MeNativeMessagingHost::Me2MeNativeMessagingHost(
     bool needs_elevation,
     intptr_t parent_window_handle,
     scoped_ptr<extensions::NativeMessagingChannel> channel,
     scoped_refptr<DaemonController> daemon_controller,
     scoped_refptr<protocol::PairingRegistry> pairing_registry,
     scoped_ptr<OAuthClient> oauth_client)
     : needs_elevation_(needs_elevation),
 #if defined(OS_WIN)
       parent_window_handle_(parent_window_handle),
 #endif
-      channel_(channel.Pass()),
+      channel_(std::move(channel)),
       log_message_handler_(
           base::Bind(&extensions::NativeMessagingChannel::SendMessage,
                      base::Unretained(channel_.get()))),
       daemon_controller_(daemon_controller),
       pairing_registry_(pairing_registry),
-      oauth_client_(oauth_client.Pass()),
+      oauth_client_(std::move(oauth_client)),
       weak_factory_(this) {
   weak_ptr_ = weak_factory_.GetWeakPtr();
 }
 
 Me2MeNativeMessagingHost::~Me2MeNativeMessagingHost() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void Me2MeNativeMessagingHost::Start(
       const base::Closure& quit_closure) {
@@ skipping 27 matching lines @@
   std::string type;
   if (!message_dict->GetString("type", &type)) {
     LOG(ERROR) << "'type' not found";
     channel_->SendMessage(nullptr);
     return;
   }
 
   response->SetString("type", type + "Response");
 
   if (type == "hello") {
-    ProcessHello(message_dict.Pass(), response.Pass());
+    ProcessHello(std::move(message_dict), std::move(response));
   } else if (type == "clearPairedClients") {
-    ProcessClearPairedClients(message_dict.Pass(), response.Pass());
+    ProcessClearPairedClients(std::move(message_dict), std::move(response));
   } else if (type == "deletePairedClient") {
-    ProcessDeletePairedClient(message_dict.Pass(), response.Pass());
+    ProcessDeletePairedClient(std::move(message_dict), std::move(response));
   } else if (type == "getHostName") {
-    ProcessGetHostName(message_dict.Pass(), response.Pass());
+    ProcessGetHostName(std::move(message_dict), std::move(response));
   } else if (type == "getPinHash") {
-    ProcessGetPinHash(message_dict.Pass(), response.Pass());
+    ProcessGetPinHash(std::move(message_dict), std::move(response));
   } else if (type == "generateKeyPair") {
-    ProcessGenerateKeyPair(message_dict.Pass(), response.Pass());
+    ProcessGenerateKeyPair(std::move(message_dict), std::move(response));
   } else if (type == "updateDaemonConfig") {
-    ProcessUpdateDaemonConfig(message_dict.Pass(), response.Pass());
+    ProcessUpdateDaemonConfig(std::move(message_dict), std::move(response));
   } else if (type == "getDaemonConfig") {
-    ProcessGetDaemonConfig(message_dict.Pass(), response.Pass());
+    ProcessGetDaemonConfig(std::move(message_dict), std::move(response));
   } else if (type == "getPairedClients") {
-    ProcessGetPairedClients(message_dict.Pass(), response.Pass());
+    ProcessGetPairedClients(std::move(message_dict), std::move(response));
   } else if (type == "getUsageStatsConsent") {
-    ProcessGetUsageStatsConsent(message_dict.Pass(), response.Pass());
+    ProcessGetUsageStatsConsent(std::move(message_dict), std::move(response));
   } else if (type == "startDaemon") {
-    ProcessStartDaemon(message_dict.Pass(), response.Pass());
+    ProcessStartDaemon(std::move(message_dict), std::move(response));
   } else if (type == "stopDaemon") {
-    ProcessStopDaemon(message_dict.Pass(), response.Pass());
+    ProcessStopDaemon(std::move(message_dict), std::move(response));
   } else if (type == "getDaemonState") {
-    ProcessGetDaemonState(message_dict.Pass(), response.Pass());
+    ProcessGetDaemonState(std::move(message_dict), std::move(response));
   } else if (type == "getHostClientId") {
-    ProcessGetHostClientId(message_dict.Pass(), response.Pass());
+    ProcessGetHostClientId(std::move(message_dict), std::move(response));
   } else if (type == "getCredentialsFromAuthCode") {
     ProcessGetCredentialsFromAuthCode(
-        message_dict.Pass(), response.Pass(), true);
+        std::move(message_dict), std::move(response), true);
   } else if (type == "getRefreshTokenFromAuthCode") {
     ProcessGetCredentialsFromAuthCode(
-        message_dict.Pass(), response.Pass(), false);
+        std::move(message_dict), std::move(response), false);
   } else {
     LOG(ERROR) << "Unsupported request type: " << type;
     OnError();
   }
 }
 
 void Me2MeNativeMessagingHost::OnDisconnect() {
   if (!quit_closure_.is_null())
     base::ResetAndReturn(&quit_closure_).Run();
 }
 
 void Me2MeNativeMessagingHost::ProcessHello(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   response->SetString("version", STRINGIZE(VERSION));
   scoped_ptr<base::ListValue> supported_features_list(new base::ListValue());
   supported_features_list->AppendStrings(std::vector<std::string>(
       kSupportedFeatures, kSupportedFeatures + arraysize(kSupportedFeatures)));
   response->Set("supportedFeatures", supported_features_list.release());
-  channel_->SendMessage(response.Pass());
+  channel_->SendMessage(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::ProcessClearPairedClients(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (needs_elevation_) {
-    if (!DelegateToElevatedHost(message.Pass()))
-      SendBooleanResult(response.Pass(), false);
+    if (!DelegateToElevatedHost(std::move(message)))
+      SendBooleanResult(std::move(response), false);
     return;
   }
 
   if (pairing_registry_.get()) {
     pairing_registry_->ClearAllPairings(
         base::Bind(&Me2MeNativeMessagingHost::SendBooleanResult, weak_ptr_,
                    base::Passed(&response)));
   } else {
-    SendBooleanResult(response.Pass(), false);
+    SendBooleanResult(std::move(response), false);
   }
 }
 
 void Me2MeNativeMessagingHost::ProcessDeletePairedClient(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (needs_elevation_) {
-    if (!DelegateToElevatedHost(message.Pass()))
-      SendBooleanResult(response.Pass(), false);
+    if (!DelegateToElevatedHost(std::move(message)))
+      SendBooleanResult(std::move(response), false);
     return;
   }
 
   std::string client_id;
   if (!message->GetString(protocol::PairingRegistry::kClientIdKey,
                           &client_id)) {
     LOG(ERROR) << "'" << protocol::PairingRegistry::kClientIdKey
                << "' string not found.";
     OnError();
     return;
   }
 
   if (pairing_registry_.get()) {
     pairing_registry_->DeletePairing(
         client_id, base::Bind(&Me2MeNativeMessagingHost::SendBooleanResult,
                               weak_ptr_, base::Passed(&response)));
   } else {
-    SendBooleanResult(response.Pass(), false);
+    SendBooleanResult(std::move(response), false);
   }
 }
 
 void Me2MeNativeMessagingHost::ProcessGetHostName(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   response->SetString("hostname", net::GetHostName());
-  channel_->SendMessage(response.Pass());
+  channel_->SendMessage(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::ProcessGetPinHash(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   std::string host_id;
   if (!message->GetString("hostId", &host_id)) {
     LOG(ERROR) << "'hostId' not found: " << message;
     OnError();
     return;
   }
   std::string pin;
   if (!message->GetString("pin", &pin)) {
     LOG(ERROR) << "'pin' not found: " << message;
     OnError();
     return;
   }
   response->SetString("hash", MakeHostPinHash(host_id, pin));
-  channel_->SendMessage(response.Pass());
+  channel_->SendMessage(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::ProcessGenerateKeyPair(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   scoped_refptr<RsaKeyPair> key_pair = RsaKeyPair::Generate();
   response->SetString("privateKey", key_pair->ToString());
   response->SetString("publicKey", key_pair->GetPublicKey());
-  channel_->SendMessage(response.Pass());
+  channel_->SendMessage(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::ProcessUpdateDaemonConfig(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (needs_elevation_) {
-    if (!DelegateToElevatedHost(message.Pass()))
-      SendAsyncResult(response.Pass(), DaemonController::RESULT_FAILED);
+    if (!DelegateToElevatedHost(std::move(message)))
+      SendAsyncResult(std::move(response), DaemonController::RESULT_FAILED);
     return;
   }
 
   scoped_ptr<base::DictionaryValue> config_dict =
-      ConfigDictionaryFromMessage(message.Pass());
+      ConfigDictionaryFromMessage(std::move(message));
   if (!config_dict) {
     OnError();
     return;
   }
 
   daemon_controller_->UpdateConfig(
-      config_dict.Pass(),
+      std::move(config_dict),
       base::Bind(&Me2MeNativeMessagingHost::SendAsyncResult, weak_ptr_,
                  base::Passed(&response)));
 }
 
 void Me2MeNativeMessagingHost::ProcessGetDaemonConfig(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   daemon_controller_->GetConfig(
       base::Bind(&Me2MeNativeMessagingHost::SendConfigResponse, weak_ptr_,
                  base::Passed(&response)));
 }
 
 void Me2MeNativeMessagingHost::ProcessGetPairedClients(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (pairing_registry_.get()) {
     pairing_registry_->GetAllPairings(
         base::Bind(&Me2MeNativeMessagingHost::SendPairedClientsResponse,
                    weak_ptr_, base::Passed(&response)));
   } else {
     scoped_ptr<base::ListValue> no_paired_clients(new base::ListValue);
-    SendPairedClientsResponse(response.Pass(), no_paired_clients.Pass());
+    SendPairedClientsResponse(std::move(response),
+                              std::move(no_paired_clients));
   }
 }
 
 void Me2MeNativeMessagingHost::ProcessGetUsageStatsConsent(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   daemon_controller_->GetUsageStatsConsent(
       base::Bind(&Me2MeNativeMessagingHost::SendUsageStatsConsentResponse,
                  weak_ptr_, base::Passed(&response)));
 }
 
 void Me2MeNativeMessagingHost::ProcessStartDaemon(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (needs_elevation_) {
-    if (!DelegateToElevatedHost(message.Pass()))
-      SendAsyncResult(response.Pass(), DaemonController::RESULT_FAILED);
+    if (!DelegateToElevatedHost(std::move(message)))
+      SendAsyncResult(std::move(response), DaemonController::RESULT_FAILED);
     return;
   }
 
   bool consent;
   if (!message->GetBoolean("consent", &consent)) {
     LOG(ERROR) << "'consent' not found.";
     OnError();
     return;
   }
 
   scoped_ptr<base::DictionaryValue> config_dict =
-      ConfigDictionaryFromMessage(message.Pass());
+      ConfigDictionaryFromMessage(std::move(message));
   if (!config_dict) {
     OnError();
     return;
   }
 
   daemon_controller_->SetConfigAndStart(
-      config_dict.Pass(), consent,
+      std::move(config_dict), consent,
       base::Bind(&Me2MeNativeMessagingHost::SendAsyncResult, weak_ptr_,
                  base::Passed(&response)));
 }
 
 void Me2MeNativeMessagingHost::ProcessStopDaemon(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (needs_elevation_) {
-    if (!DelegateToElevatedHost(message.Pass()))
-      SendAsyncResult(response.Pass(), DaemonController::RESULT_FAILED);
+    if (!DelegateToElevatedHost(std::move(message)))
+      SendAsyncResult(std::move(response), DaemonController::RESULT_FAILED);
     return;
   }
 
   daemon_controller_->Stop(
       base::Bind(&Me2MeNativeMessagingHost::SendAsyncResult, weak_ptr_,
                  base::Passed(&response)));
 }
 
 void Me2MeNativeMessagingHost::ProcessGetDaemonState(
     scoped_ptr<base::DictionaryValue> message,
@@ skipping 14 matching lines @@
     case DaemonController::STATE_STARTED:
       response->SetString("state", "STARTED");
       break;
     case DaemonController::STATE_STOPPING:
       response->SetString("state", "STOPPING");
       break;
     case DaemonController::STATE_UNKNOWN:
       response->SetString("state", "UNKNOWN");
       break;
   }
-  channel_->SendMessage(response.Pass());
+  channel_->SendMessage(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::ProcessGetHostClientId(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   response->SetString("clientId", google_apis::GetOAuth2ClientID(
       google_apis::CLIENT_REMOTING_HOST));
-  channel_->SendMessage(response.Pass());
+  channel_->SendMessage(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::ProcessGetCredentialsFromAuthCode(
     scoped_ptr<base::DictionaryValue> message,
     scoped_ptr<base::DictionaryValue> response,
     bool need_user_email) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   std::string auth_code;
   if (!message->GetString("authorizationCode", &auth_code)) {
@@ skipping 17 matching lines @@
 void Me2MeNativeMessagingHost::SendConfigResponse(
     scoped_ptr<base::DictionaryValue> response,
     scoped_ptr<base::DictionaryValue> config) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (config) {
     response->Set("config", config.release());
   } else {
     response->Set("config", base::Value::CreateNullValue());
   }
-  channel_->SendMessage(response.Pass());
+  channel_->SendMessage(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::SendPairedClientsResponse(
     scoped_ptr<base::DictionaryValue> response,
     scoped_ptr<base::ListValue> pairings) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   response->Set("pairedClients", pairings.release());
-  channel_->SendMessage(response.Pass());
+  channel_->SendMessage(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::SendUsageStatsConsentResponse(
     scoped_ptr<base::DictionaryValue> response,
     const DaemonController::UsageStatsConsent& consent) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   response->SetBoolean("supported", consent.supported);
   response->SetBoolean("allowed", consent.allowed);
   response->SetBoolean("setByPolicy", consent.set_by_policy);
-  channel_->SendMessage(response.Pass());
+  channel_->SendMessage(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::SendAsyncResult(
     scoped_ptr<base::DictionaryValue> response,
     DaemonController::AsyncResult result) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   switch (result) {
     case DaemonController::RESULT_OK:
       response->SetString("result", "OK");
       break;
     case DaemonController::RESULT_FAILED:
       response->SetString("result", "FAILED");
       break;
     case DaemonController::RESULT_CANCELLED:
       response->SetString("result", "CANCELLED");
       break;
     case DaemonController::RESULT_FAILED_DIRECTORY:
       response->SetString("result", "FAILED_DIRECTORY");
       break;
   }
-  channel_->SendMessage(response.Pass());
+  channel_->SendMessage(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::SendBooleanResult(
     scoped_ptr<base::DictionaryValue> response, bool result) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   response->SetBoolean("result", result);
-  channel_->SendMessage(response.Pass());
+  channel_->SendMessage(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::SendCredentialsResponse(
     scoped_ptr<base::DictionaryValue> response,
     const std::string& user_email,
     const std::string& refresh_token) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!user_email.empty()) {
     response->SetString("userEmail", user_email);
   }
   response->SetString("refreshToken", refresh_token);
-  channel_->SendMessage(response.Pass());
+  channel_->SendMessage(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::OnError() {
   // Trigger a host shutdown by sending a nullptr message.
   channel_->SendMessage(nullptr);
 }
 
 void Me2MeNativeMessagingHost::Stop() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!quit_closure_.is_null())
     base::ResetAndReturn(&quit_closure_).Run();
 }
 
 #if defined(OS_WIN)
 Me2MeNativeMessagingHost::ElevatedChannelEventHandler::
     ElevatedChannelEventHandler(Me2MeNativeMessagingHost* host)
     : parent_(host) {
 }
 
 void Me2MeNativeMessagingHost::ElevatedChannelEventHandler::OnMessage(
     scoped_ptr<base::Value> message) {
   DCHECK(parent_->thread_checker_.CalledOnValidThread());
 
   // Simply pass along the response from the elevated host to the client.
-  parent_->channel_->SendMessage(message.Pass());
+  parent_->channel_->SendMessage(std::move(message));
 }
 
 void Me2MeNativeMessagingHost::ElevatedChannelEventHandler::OnDisconnect() {
   parent_->OnDisconnect();
 }
 
 bool Me2MeNativeMessagingHost::DelegateToElevatedHost(
     scoped_ptr<base::DictionaryValue> message) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   EnsureElevatedHostCreated();
 
   // elevated_channel_ will be null if user rejects the UAC request.
   if (elevated_channel_)
-    elevated_channel_->SendMessage(message.Pass());
+    elevated_channel_->SendMessage(std::move(message));
 
   return elevated_channel_ != nullptr;
 }
 
 void Me2MeNativeMessagingHost::EnsureElevatedHostCreated() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(needs_elevation_);
 
   if (elevated_channel_)
     return;
@@ skipping 160 matching lines @@
 
 bool Me2MeNativeMessagingHost::DelegateToElevatedHost(
     scoped_ptr<base::DictionaryValue> message) {
   NOTREACHED();
   return false;
 }
 
 #endif  // !defined(OS_WIN)
 
 }  // namespace remoting