Reland of Remove ScopedVector from all other codes in media/

media/base/content_decryption_module.h

 // 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.
 
 #ifndef MEDIA_BASE_CONTENT_DECRYPTION_MODULE_H_
 #define MEDIA_BASE_CONTENT_DECRYPTION_MODULE_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
 #include "media/base/eme_constants.h"
 #include "media/base/media_export.h"
 #include "url/gurl.h"
 
 namespace base {
 class Time;
 }
 
 namespace media {
 
 class CdmContext;
 struct CdmKeyInformation;
 struct ContentDecryptionModuleTraits;
 
 template <typename... T>
 class CdmPromiseTemplate;
 
 typedef CdmPromiseTemplate<std::string> NewSessionCdmPromise;
 typedef CdmPromiseTemplate<> SimpleCdmPromise;
-typedef ScopedVector<CdmKeyInformation> CdmKeysInfo;
+typedef std::vector<std::unique_ptr<CdmKeyInformation>> CdmKeysInfo;
 
 // Type of license required when creating/loading a session.
 // Must be consistent with the values specified in the spec:
 // https://w3c.github.io/encrypted-media/#idl-def-MediaKeySessionType
 enum class CdmSessionType {
   TEMPORARY_SESSION,
   PERSISTENT_LICENSE_SESSION,
   PERSISTENT_RELEASE_MESSAGE_SESSION,
   SESSION_TYPE_MAX = PERSISTENT_RELEASE_MESSAGE_SESSION
 };
@@ skipping 144 matching lines @@
 // A null base::Time() will be translated to NaN in Javascript, which means "no
 // such time exists or if the license explicitly never expires, as determined
 // by the CDM", according to the EME spec.
 typedef base::Callback<void(const std::string& session_id,
                             base::Time new_expiry_time)>
     SessionExpirationUpdateCB;
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_CONTENT_DECRYPTION_MODULE_H_