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

Unified Diff: media/base/mock_filters.h

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/decryptor_client.h ('k') | media/base/mock_filters.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 518a180ee9301490b882f8b877cbfbfde6bd47ee..3c98ae880d5170fbacacadcbc61984f9b487e13f 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -196,7 +196,8 @@ class MockDecryptor : public Decryptor {
MockDecryptor();
virtual ~MockDecryptor();
- MOCK_METHOD3(GenerateKeyRequest, bool(const std::string& key_system,
+ MOCK_METHOD4(GenerateKeyRequest, bool(const std::string& key_system,
+ const std::string& type,
const uint8* init_data,
int init_data_length));
MOCK_METHOD6(AddKey, void(const std::string& key_system,
@@ -259,8 +260,9 @@ class MockDecryptorClient : public DecryptorClient {
const uint8* message,
int message_length,
const std::string& default_url));
- MOCK_METHOD4(NeedKeyMock, void(const std::string& key_system,
+ MOCK_METHOD5(NeedKeyMock, void(const std::string& key_system,
const std::string& session_id,
+ const std::string& type,
const uint8* init_data,
int init_data_length));
virtual void KeyMessage(const std::string& key_system,
@@ -270,6 +272,7 @@ class MockDecryptorClient : public DecryptorClient {
const std::string& default_url) OVERRIDE;
virtual void NeedKey(const std::string& key_system,
const std::string& session_id,
+ const std::string& type,
scoped_array<uint8> init_data,
int init_data_length) OVERRIDE;
« no previous file with comments | « media/base/decryptor_client.h ('k') | media/base/mock_filters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698