Remove raw base::DictionaryValue::Set

media/cdm/json_web_key.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 "media/cdm/json_web_key.h"
 
 #include <stddef.h>
 
 #include <memory>
+#include <utility>
 
 #include "base/base64url.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "media/base/content_decryption_module.h"
 
 namespace media {
 
 const char kKeysTag[] = "keys";
 const char kKeyTypeTag[] = "kty";
@@ skipping 27 matching lines @@
     const uint8_t* key_id,
     int key_id_length) {
   std::string key_string, key_id_string;
   base::Base64UrlEncode(
       base::StringPiece(reinterpret_cast<const char*>(key), key_length),
       base::Base64UrlEncodePolicy::OMIT_PADDING, &key_string);
   base::Base64UrlEncode(
       base::StringPiece(reinterpret_cast<const char*>(key_id), key_id_length),
       base::Base64UrlEncodePolicy::OMIT_PADDING, &key_id_string);
 
-  std::unique_ptr<base::DictionaryValue> jwk(new base::DictionaryValue());
+  auto jwk = base::MakeUnique<base::DictionaryValue>();
   jwk->SetString(kKeyTypeTag, kKeyTypeOct);
   jwk->SetString(kKeyTag, key_string);
   jwk->SetString(kKeyIdTag, key_id_string);
   return jwk;
 }
 
 std::string GenerateJWKSet(const uint8_t* key,
                            int key_length,
                            const uint8_t* key_id,
                            int key_id_length) {
   // Create the JWK, and wrap it into a JWK Set.
-  std::unique_ptr<base::ListValue> list(new base::ListValue());
+  auto list = base::MakeUnique<base::ListValue>();
   list->Append(CreateJSONDictionary(key, key_length, key_id, key_id_length));
   base::DictionaryValue jwk_set;
-  jwk_set.Set(kKeysTag, list.release());
+  jwk_set.Set(kKeysTag, std::move(list));
 
   // Finally serialize |jwk_set| into a string and return it.
   std::string serialized_jwk;
   JSONStringValueSerializer serializer(&serialized_jwk);
   serializer.Serialize(jwk_set);
   return serialized_jwk;
 }
 
 std::string GenerateJWKSet(const KeyIdAndKeyPairs& keys,
                            CdmSessionType session_type) {
-  std::unique_ptr<base::ListValue> list(new base::ListValue());
+  auto list = base::MakeUnique<base::ListValue>();
   for (const auto& key_pair : keys) {
     list->Append(CreateJSONDictionary(
         reinterpret_cast<const uint8_t*>(key_pair.second.data()),
         key_pair.second.length(),
         reinterpret_cast<const uint8_t*>(key_pair.first.data()),
         key_pair.first.length()));
   }
 
   base::DictionaryValue jwk_set;
-  jwk_set.Set(kKeysTag, list.release());
+  jwk_set.Set(kKeysTag, std::move(list));
   switch (session_type) {
     case CdmSessionType::TEMPORARY_SESSION:
       jwk_set.SetString(kTypeTag, kTemporarySession);
       break;
     case CdmSessionType::PERSISTENT_LICENSE_SESSION:
       jwk_set.SetString(kTypeTag, kPersistentLicenseSession);
       break;
     case CdmSessionType::PERSISTENT_RELEASE_MESSAGE_SESSION:
       jwk_set.SetString(kTypeTag, kPersistentReleaseMessageSession);
       break;
@@ skipping 184 matching lines @@
   // All done.
   key_ids->swap(local_key_ids);
   error_message->clear();
   return true;
 }
 
 void CreateLicenseRequest(const KeyIdList& key_ids,
                           CdmSessionType session_type,
                           std::vector<uint8_t>* license) {
   // Create the license request.
-  std::unique_ptr<base::DictionaryValue> request(new base::DictionaryValue());
-  std::unique_ptr<base::ListValue> list(new base::ListValue());
+  auto request = base::MakeUnique<base::DictionaryValue>();
+  auto list = base::MakeUnique<base::ListValue>();
   for (const auto& key_id : key_ids) {
     std::string key_id_string;
     base::Base64UrlEncode(
         base::StringPiece(reinterpret_cast<const char*>(key_id.data()),
                           key_id.size()),
         base::Base64UrlEncodePolicy::OMIT_PADDING, &key_id_string);
 
     list->AppendString(key_id_string);
   }
-  request->Set(kKeyIdsTag, list.release());
+  request->Set(kKeyIdsTag, std::move(list));
 
   switch (session_type) {
     case CdmSessionType::TEMPORARY_SESSION:
       request->SetString(kTypeTag, kTemporarySession);
       break;
     case CdmSessionType::PERSISTENT_LICENSE_SESSION:
       request->SetString(kTypeTag, kPersistentLicenseSession);
       break;
     case CdmSessionType::PERSISTENT_RELEASE_MESSAGE_SESSION:
       request->SetString(kTypeTag, kPersistentReleaseMessageSession);
       break;
   }
 
   // Serialize the license request as a string.
   std::string json;
   JSONStringValueSerializer serializer(&json);
   serializer.Serialize(*request);
 
   // Convert the serialized license request into std::vector and return it.
   std::vector<uint8_t> result(json.begin(), json.end());
   license->swap(result);
 }
 
 void CreateKeyIdsInitData(const KeyIdList& key_ids,
                           std::vector<uint8_t>* init_data) {
   // Create the init_data.
-  std::unique_ptr<base::DictionaryValue> dictionary(
-      new base::DictionaryValue());
-  std::unique_ptr<base::ListValue> list(new base::ListValue());
+  auto dictionary = base::MakeUnique<base::DictionaryValue>();
+  auto list = base::MakeUnique<base::ListValue>();
   for (const auto& key_id : key_ids) {
     std::string key_id_string;
     base::Base64UrlEncode(
         base::StringPiece(reinterpret_cast<const char*>(key_id.data()),
                           key_id.size()),
         base::Base64UrlEncodePolicy::OMIT_PADDING, &key_id_string);
 
     list->AppendString(key_id_string);
   }
-  dictionary->Set(kKeyIdsTag, list.release());
+  dictionary->Set(kKeyIdsTag, std::move(list));
 
   // Serialize the dictionary as a string.
   std::string json;
   JSONStringValueSerializer serializer(&json);
   serializer.Serialize(*dictionary);
 
   // Convert the serialized data into std::vector and return it.
   std::vector<uint8_t> result(json.begin(), json.end());
   init_data->swap(result);
 }
@@ skipping 44 matching lines @@
     DVLOG(1) << "Invalid '" << kKeyIdsTag << "' value: " << encoded_key;
     return false;
   }
 
   std::vector<uint8_t> result(decoded_string.begin(), decoded_string.end());
   first_key->swap(result);
   return true;
 }
 
 }  // namespace media