Reland of Remove ScopedVector from all other codes in media/

media/mojo/clients/mojo_cdm.cc

 // Copyright 2014 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/mojo/clients/mojo_cdm.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 303 matching lines @@
       DCHECK(decryptor_task_runner_);
       decryptor_task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&MojoCdm::OnKeyAdded, weak_factory_.GetWeakPtr()));
     }
   }
 
   CdmKeysInfo key_data;
   key_data.reserve(keys_info.size());
   for (size_t i = 0; i < keys_info.size(); ++i) {
-    key_data.push_back(
-        keys_info[i].To<std::unique_ptr<CdmKeyInformation>>().release());
+    key_data.push_back(keys_info[i].To<std::unique_ptr<CdmKeyInformation>>());
   }
   session_keys_change_cb_.Run(session_id, has_additional_usable_key,
                               std::move(key_data));
 }
 
 void MojoCdm::OnSessionExpirationUpdate(const std::string& session_id,
                                         double new_expiry_time_sec) {
   DVLOG(2) << __func__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ skipping 54 matching lines @@
     cdm_session_tracker_.AddSession(session_id);
     cdm_promise_adapter_.ResolvePromise(promise_id, session_id);
   } else {
     cdm_promise_adapter_.RejectPromise(promise_id, result->exception,
                                        result->system_code,
                                        result->error_message);
   }
 }
 
 }  // namespace media