| Index: media/filters/pipeline_integration_test.cc
|
| diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
|
| index 1a5603bc77d59bd75e3ebbda792dcb23406f44a4..f305d12ff0dc121f9c3c46aac2087e028ff903eb 100644
|
| --- a/media/filters/pipeline_integration_test.cc
|
| +++ b/media/filters/pipeline_integration_test.cc
|
| @@ -119,7 +119,8 @@ class FakeEncryptedMedia {
|
| const std::vector<uint8>& message,
|
| const GURL& destination_url) = 0;
|
|
|
| - virtual void OnSessionReady(const std::string& web_session_id) = 0;
|
| + virtual void OnSessionKeysChange(const std::string& web_session_id,
|
| + bool has_additional_usable_key) = 0;
|
|
|
| virtual void OnSessionClosed(const std::string& web_session_id) = 0;
|
|
|
| @@ -139,6 +140,8 @@ class FakeEncryptedMedia {
|
| FakeEncryptedMedia(AppBase* app)
|
| : decryptor_(base::Bind(&FakeEncryptedMedia::OnSessionMessage,
|
| base::Unretained(this)),
|
| + base::Bind(&FakeEncryptedMedia::OnSessionKeysChange,
|
| + base::Unretained(this)),
|
| base::Bind(&FakeEncryptedMedia::OnSessionClosed,
|
| base::Unretained(this))),
|
| app_(app) {}
|
| @@ -154,8 +157,9 @@ class FakeEncryptedMedia {
|
| app_->OnSessionMessage(web_session_id, message, destination_url);
|
| }
|
|
|
| - void OnSessionReady(const std::string& web_session_id) {
|
| - app_->OnSessionReady(web_session_id);
|
| + void OnSessionKeysChange(const std::string& web_session_id,
|
| + bool has_additional_usable_key) {
|
| + app_->OnSessionKeysChange(web_session_id, has_additional_usable_key);
|
| }
|
|
|
| void OnSessionClosed(const std::string& web_session_id) {
|
| @@ -234,8 +238,10 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase {
|
| EXPECT_EQ(current_session_id_, web_session_id);
|
| }
|
|
|
| - virtual void OnSessionReady(const std::string& web_session_id) OVERRIDE {
|
| + virtual void OnSessionKeysChange(const std::string& web_session_id,
|
| + bool has_additional_usable_key) OVERRIDE {
|
| EXPECT_EQ(current_session_id_, web_session_id);
|
| + EXPECT_EQ(has_additional_usable_key, true);
|
| }
|
|
|
| virtual void OnSessionClosed(const std::string& web_session_id) OVERRIDE {
|
| @@ -359,9 +365,10 @@ class NoResponseApp : public FakeEncryptedMedia::AppBase {
|
| FAIL() << "Unexpected Message";
|
| }
|
|
|
| - virtual void OnSessionReady(const std::string& web_session_id) OVERRIDE {
|
| + virtual void OnSessionKeysChange(const std::string& web_session_id,
|
| + bool has_additional_usable_key) OVERRIDE {
|
| EXPECT_FALSE(web_session_id.empty());
|
| - FAIL() << "Unexpected Ready";
|
| + EXPECT_EQ(has_additional_usable_key, true);
|
| }
|
|
|
| virtual void OnSessionClosed(const std::string& web_session_id) OVERRIDE {
|
|
|