Remove raw base::DictionaryValue::Set

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 <cstdint>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 78 matching lines @@
   weak_ptr_ = weak_factory_.GetWeakPtr();
 }
 
 Me2MeNativeMessagingHost::~Me2MeNativeMessagingHost() {
   DCHECK(task_runner()->BelongsToCurrentThread());
 }
 
 void Me2MeNativeMessagingHost::OnMessage(const std::string& message) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
-  std::unique_ptr<base::DictionaryValue> response(new base::DictionaryValue());
+  auto response = base::MakeUnique<base::DictionaryValue>();
   std::unique_ptr<base::Value> message_value = base::JSONReader::Read(message);
   if (!message_value->IsType(base::Value::Type::DICTIONARY)) {
     OnError("Received a message that's not a dictionary.");
     return;
   }
 
   std::unique_ptr<base::DictionaryValue> message_dict(
       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->CreateDeepCopy());
+    response->Set("id", base::MakeUnique<base::Value>(*id));
 
   std::string type;
   if (!message_dict->GetString("type", &type)) {
     OnError("'type' not found");
     return;
   }
 
   response->SetString("type", type + "Response");
 
   if (type == "hello") {
@@ skipping 50 matching lines @@
 void Me2MeNativeMessagingHost::ProcessHello(
     std::unique_ptr<base::DictionaryValue> message,
     std::unique_ptr<base::DictionaryValue> response) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   response->SetString("version", STRINGIZE(VERSION));
   std::unique_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());
+  response->Set("supportedFeatures", std::move(supported_features_list));
   SendMessageToClient(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::ProcessClearPairedClients(
     std::unique_ptr<base::DictionaryValue> message,
     std::unique_ptr<base::DictionaryValue> response) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   if (needs_elevation_) {
     if (!DelegateToElevatedHost(std::move(message))) {
@@ skipping 254 matching lines @@
           &Me2MeNativeMessagingHost::SendCredentialsResponse, weak_ptr_,
           base::Passed(&response)));
 }
 
 void Me2MeNativeMessagingHost::SendConfigResponse(
     std::unique_ptr<base::DictionaryValue> response,
     std::unique_ptr<base::DictionaryValue> config) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   if (config) {
-    response->Set("config", config.release());
+    response->Set("config", std::move(config));
   } else {
     response->Set("config", base::MakeUnique<base::Value>());
   }
   SendMessageToClient(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::SendPairedClientsResponse(
     std::unique_ptr<base::DictionaryValue> response,
     std::unique_ptr<base::ListValue> pairings) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
-  response->Set("pairedClients", pairings.release());
+  response->Set("pairedClients", std::move(pairings));
   SendMessageToClient(std::move(response));
 }
 
 void Me2MeNativeMessagingHost::SendUsageStatsConsentResponse(
     std::unique_ptr<base::DictionaryValue> response,
     const DaemonController::UsageStatsConsent& consent) {
   DCHECK(task_runner()->BelongsToCurrentThread());
 
   response->SetBoolean("supported", consent.supported);
   response->SetBoolean("allowed", consent.allowed);
@@ skipping 89 matching lines @@
 
 bool Me2MeNativeMessagingHost::DelegateToElevatedHost(
     std::unique_ptr<base::DictionaryValue> message) {
   NOTREACHED();
   return false;
 }
 
 #endif  // !defined(OS_WIN)
 
 }  // namespace remoting