Remove raw base::DictionaryValue::Set

google_apis/gaia/google_service_auth_error.cc

 // Copyright (c) 2012 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 "google_apis/gaia/google_service_auth_error.h"
 
 #include <string>
+#include <utility>
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "net/base/net_errors.h"
 
 GoogleServiceAuthError::Captcha::Captcha() : image_width(0), image_height(0) {
 }
 
 GoogleServiceAuthError::Captcha::Captcha(
     const std::string& token, const GURL& audio, const GURL& img,
@@ skipping 169 matching lines @@
 #undef STATE_CASE
     default:
       NOTREACHED();
       break;
   }
   value->SetString("state", state_str);
   if (!error_message_.empty()) {
     value->SetString("errorMessage", error_message_);
   }
   if (state_ == CAPTCHA_REQUIRED) {
-    base::DictionaryValue* captcha_value = new base::DictionaryValue();
-    value->Set("captcha", captcha_value);
+    auto captcha_value = base::MakeUnique<base::DictionaryValue>();
     captcha_value->SetString("token", captcha_.token);
     captcha_value->SetString("audioUrl", captcha_.audio_url.spec());
     captcha_value->SetString("imageUrl", captcha_.image_url.spec());
     captcha_value->SetString("unlockUrl", captcha_.unlock_url.spec());
     captcha_value->SetInteger("imageWidth", captcha_.image_width);
     captcha_value->SetInteger("imageHeight", captcha_.image_height);
+    value->Set("captcha", std::move(captcha_value));
   } else if (state_ == CONNECTION_FAILED) {
     value->SetString("networkError", net::ErrorToString(network_error_));
   } else if (state_ == TWO_FACTOR) {
-    base::DictionaryValue* two_factor_value = new base::DictionaryValue();
-    value->Set("two_factor", two_factor_value);
+    auto two_factor_value = base::MakeUnique<base::DictionaryValue>();
     two_factor_value->SetString("token", second_factor_.token);
     two_factor_value->SetString("promptText", second_factor_.prompt_text);
     two_factor_value->SetString("alternateText", second_factor_.alternate_text);
     two_factor_value->SetInteger("fieldLength", second_factor_.field_length);
+    value->Set("two_factor", std::move(two_factor_value));
   }
   return value;
 }
 
 std::string GoogleServiceAuthError::ToString() const {
   switch (state_) {
     case NONE:
       return std::string();
     case INVALID_GAIA_CREDENTIALS:
       return "Invalid credentials.";
@@ skipping 60 matching lines @@
     const GURL& captcha_audio_url,
     const GURL& captcha_image_url,
     const GURL& captcha_unlock_url,
     int image_width,
     int image_height)
     : state_(s),
       captcha_(captcha_token, captcha_audio_url, captcha_image_url,
                captcha_unlock_url, image_width, image_height),
       network_error_(0) {
 }