Replace scoped_ptr with std::unique_ptr in //media.

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 "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/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 
 namespace media {
 
 const char kKeysTag[] = "keys";
 const char kKeyTypeTag[] = "kty";
 const char kKeyTypeOct[] = "oct";  // Octet sequence.
@@ skipping 13 matching lines @@
   std::string escaped_str =
       base::EscapeBytesAsInvalidJSONString(input.substr(0, 65), false);
   if (escaped_str.length() <= 64u)
     return escaped_str;
 
   // This may end up truncating an escaped character, but the first part of
   // the string should provide enough information.
   return escaped_str.substr(0, 61).append("...");
 }
 
-static scoped_ptr<base::DictionaryValue> CreateJSONDictionary(
+static std::unique_ptr<base::DictionaryValue> CreateJSONDictionary(
     const uint8_t* key,
     int key_length,
     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);
 
-  scoped_ptr<base::DictionaryValue> jwk(new base::DictionaryValue());
+  std::unique_ptr<base::DictionaryValue> jwk(new 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.
-  scoped_ptr<base::ListValue> list(new base::ListValue());
+  std::unique_ptr<base::ListValue> list(new base::ListValue());
   list->Append(
       CreateJSONDictionary(key, key_length, key_id, key_id_length).release());
   base::DictionaryValue jwk_set;
   jwk_set.Set(kKeysTag, list.release());
 
   // 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,
                            MediaKeys::SessionType session_type) {
-  scoped_ptr<base::ListValue> list(new base::ListValue());
+  std::unique_ptr<base::ListValue> list(new 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())
                      .release());
   }
 
   base::DictionaryValue jwk_set;
@@ skipping 64 matching lines @@
 }
 
 bool ExtractKeysFromJWKSet(const std::string& jwk_set,
                            KeyIdAndKeyPairs* keys,
                            MediaKeys::SessionType* session_type) {
   if (!base::IsStringASCII(jwk_set)) {
     DVLOG(1) << "Non ASCII JWK Set: " << jwk_set;
     return false;
   }
 
-  scoped_ptr<base::Value> root(base::JSONReader().ReadToValue(jwk_set));
+  std::unique_ptr<base::Value> root(base::JSONReader().ReadToValue(jwk_set));
   if (!root.get() || root->GetType() != base::Value::TYPE_DICTIONARY) {
     DVLOG(1) << "Not valid JSON: " << jwk_set << ", root: " << root.get();
     return false;
   }
 
   // Locate the set from the dictionary.
   base::DictionaryValue* dictionary =
       static_cast<base::DictionaryValue*>(root.get());
   base::ListValue* list_val = NULL;
   if (!dictionary->GetList(kKeysTag, &list_val)) {
@@ skipping 48 matching lines @@
 
 bool ExtractKeyIdsFromKeyIdsInitData(const std::string& input,
                                      KeyIdList* key_ids,
                                      std::string* error_message) {
   if (!base::IsStringASCII(input)) {
     error_message->assign("Non ASCII: ");
     error_message->append(ShortenTo64Characters(input));
     return false;
   }
 
-  scoped_ptr<base::Value> root(base::JSONReader().ReadToValue(input));
+  std::unique_ptr<base::Value> root(base::JSONReader().ReadToValue(input));
   if (!root.get() || root->GetType() != base::Value::TYPE_DICTIONARY) {
     error_message->assign("Not valid JSON: ");
     error_message->append(ShortenTo64Characters(input));
     return false;
   }
 
   // Locate the set from the dictionary.
   base::DictionaryValue* dictionary =
       static_cast<base::DictionaryValue*>(root.get());
   base::ListValue* list_val = NULL;
@@ skipping 41 matching lines @@
   // All done.
   key_ids->swap(local_key_ids);
   error_message->clear();
   return true;
 }
 
 void CreateLicenseRequest(const KeyIdList& key_ids,
                           MediaKeys::SessionType session_type,
                           std::vector<uint8_t>* license) {
   // Create the license request.
-  scoped_ptr<base::DictionaryValue> request(new base::DictionaryValue());
-  scoped_ptr<base::ListValue> list(new base::ListValue());
+  std::unique_ptr<base::DictionaryValue> request(new base::DictionaryValue());
+  std::unique_ptr<base::ListValue> list(new 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());
@@ skipping 16 matching lines @@
   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.
-  scoped_ptr<base::DictionaryValue> dictionary(new base::DictionaryValue());
-  scoped_ptr<base::ListValue> list(new base::ListValue());
+  std::unique_ptr<base::DictionaryValue> dictionary(
+      new base::DictionaryValue());
+  std::unique_ptr<base::ListValue> list(new 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());
@@ skipping 11 matching lines @@
 bool ExtractFirstKeyIdFromLicenseRequest(const std::vector<uint8_t>& license,
                                          std::vector<uint8_t>* first_key) {
   const std::string license_as_str(
       reinterpret_cast<const char*>(!license.empty() ? &license[0] : NULL),
       license.size());
   if (!base::IsStringASCII(license_as_str)) {
     DVLOG(1) << "Non ASCII license: " << license_as_str;
     return false;
   }
 
-  scoped_ptr<base::Value> root(base::JSONReader().ReadToValue(license_as_str));
+  std::unique_ptr<base::Value> root(
+      base::JSONReader().ReadToValue(license_as_str));
   if (!root.get() || root->GetType() != base::Value::TYPE_DICTIONARY) {
     DVLOG(1) << "Not valid JSON: " << license_as_str;
     return false;
   }
 
   // Locate the set from the dictionary.
   base::DictionaryValue* dictionary =
       static_cast<base::DictionaryValue*>(root.get());
   base::ListValue* list_val = NULL;
   if (!dictionary->GetList(kKeyIdsTag, &list_val)) {
@@ skipping 21 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