media/base/content_decryption_module.h - Issue 2895573002: Reland of Remove ScopedVector from all other codes in media/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/base/content_decryption_module.h

Issue 2895573002: Reland of Remove ScopedVector from all other codes in media/ (Closed)

Patch Set: Fix the compile fails in build target "jpeg_decode_accelerator_unittest" Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: media/base/content_decryption_module.h

diff --git a/media/base/content_decryption_module.h b/media/base/content_decryption_module.h

index fac2bcdec7b1a50a702a23692fbb583836b3d036..f40cc1bb98f61fe7b5da9fa8aa2007aa55095c73 100644

--- a/media/base/content_decryption_module.h

+++ b/media/base/content_decryption_module.h

@@ -14,7 +14,6 @@

#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"

@@ -34,7 +33,7 @@ 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:

« no previous file with comments | « media/base/android/media_drm_bridge.cc ('k') | media/blink/cdm_session_adapter.cc » ('j') | no next file with comments »