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

media/cdm/aes_decryptor_unittest.cc

Index: media/cdm/aes_decryptor_unittest.cc
diff --git a/media/cdm/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc
index 4472afe07de8e471b1836f34f7484b89d0a2d6be..7462010793fefa197f00d01978663ebaf89ad1ef 100644
--- a/media/cdm/aes_decryptor_unittest.cc
+++ b/media/cdm/aes_decryptor_unittest.cc
@@ -43,7 +43,7 @@ MATCHER(IsEmpty, "") { return arg.empty(); }
 MATCHER(IsNotEmpty, "") { return !arg.empty(); }
 MATCHER(IsJSONDictionary, "") {
   std::string result(arg.begin(), arg.end());
-  scoped_ptr<base::Value> root(base::JSONReader().ReadToValue(result));
+  std::unique_ptr<base::Value> root(base::JSONReader().ReadToValue(result));
   return (root.get() && root->GetType() == base::Value::TYPE_DICTIONARY);
 }
 
@@ -203,7 +203,7 @@ static scoped_refptr<DecoderBuffer> CreateEncryptedBuffer(
       key_id.size());
   std::string iv_string(
       reinterpret_cast<const char*>(iv.empty() ? NULL : &iv[0]), iv.size());
-  encrypted_buffer->set_decrypt_config(scoped_ptr<DecryptConfig>(
+  encrypted_buffer->set_decrypt_config(std::unique_ptr<DecryptConfig>(
       new DecryptConfig(key_id_string, iv_string, subsample_entries)));
   return encrypted_buffer;
 }
@@ -247,7 +247,7 @@ class AesDecryptorTest : public testing::TestWithParam<std::string> {
       CdmConfig cdm_config;  // default settings of false are sufficient.
 
       helper_.reset(new ExternalClearKeyTestHelper());
-      scoped_ptr<CdmAllocator> allocator(new SimpleCdmAllocator());
+      std::unique_ptr<CdmAllocator> allocator(new SimpleCdmAllocator());
       CdmAdapter::Create(
           helper_->KeySystemName(), helper_->LibraryPath(), cdm_config,
           std::move(allocator), base::Bind(&AesDecryptorTest::CreateCdmFileIO,
@@ -299,26 +299,23 @@ class AesDecryptorTest : public testing::TestWithParam<std::string> {
         << "Unexpectedly rejected with message: " << error_message;
   }
 
-  scoped_ptr<SimpleCdmPromise> CreatePromise(ExpectedResult expected_result) {
-    scoped_ptr<SimpleCdmPromise> promise(
-        new CdmCallbackPromise<>(base::Bind(&AesDecryptorTest::OnResolve,
-                                            base::Unretained(this),
-                                            expected_result),
-                                 base::Bind(&AesDecryptorTest::OnReject,
-                                            base::Unretained(this),
-                                            expected_result)));
+  std::unique_ptr<SimpleCdmPromise> CreatePromise(
+      ExpectedResult expected_result) {
+    std::unique_ptr<SimpleCdmPromise> promise(new CdmCallbackPromise<>(
+        base::Bind(&AesDecryptorTest::OnResolve, base::Unretained(this),
+                   expected_result),
+        base::Bind(&AesDecryptorTest::OnReject, base::Unretained(this),
+                   expected_result)));
     return promise;
   }
 
-  scoped_ptr<NewSessionCdmPromise> CreateSessionPromise(
+  std::unique_ptr<NewSessionCdmPromise> CreateSessionPromise(
       ExpectedResult expected_result) {
-    scoped_ptr<NewSessionCdmPromise> promise(
+    std::unique_ptr<NewSessionCdmPromise> promise(
         new CdmCallbackPromise<std::string>(
             base::Bind(&AesDecryptorTest::OnResolveWithSession,
-                       base::Unretained(this),
-                       expected_result),
-            base::Bind(&AesDecryptorTest::OnReject,
-                       base::Unretained(this),
+                       base::Unretained(this), expected_result),
+            base::Bind(&AesDecryptorTest::OnReject, base::Unretained(this),
                        expected_result)));
     return promise;
   }
@@ -486,7 +483,7 @@ class AesDecryptorTest : public testing::TestWithParam<std::string> {
   CdmKeysInfo keys_info_;
 
   // Helper class to load/unload External Clear Key Library, if necessary.
-  scoped_ptr<ExternalClearKeyTestHelper> helper_;
+  std::unique_ptr<ExternalClearKeyTestHelper> helper_;
 
   base::MessageLoop message_loop_;