Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(598)

Unified Diff: media/base/mock_filters.cc

Issue 11313016: Add "type" in GenerateKeyRequest() and OnNeedKey(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix the DCHECK where init_data_type_ is set but NeedKey from decoder passes empty "type". Created 8 years, 2 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/stream_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_filters.cc
diff --git a/media/base/mock_filters.cc b/media/base/mock_filters.cc
index 249e531424ed4ce35bd3e0165ed19d782690f1bc..d32501e44ac79bf141f79869c97809f1f719b6e5 100644
--- a/media/base/mock_filters.cc
+++ b/media/base/mock_filters.cc
@@ -73,9 +73,10 @@ void MockDecryptorClient::KeyMessage(const std::string& key_system,
void MockDecryptorClient::NeedKey(const std::string& key_system,
const std::string& session_id,
+ const std::string& type,
scoped_array<uint8> init_data,
int init_data_length) {
- NeedKeyMock(key_system, session_id, init_data.get(), init_data_length);
+ NeedKeyMock(key_system, session_id, type, init_data.get(), init_data_length);
}
MockFilterCollection::MockFilterCollection()
« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/stream_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698