Update MediaKeys interface for EME

media/filters/pipeline_integration_test.cc

 // Copyright (c) 2012 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.
 
 #include "media/filters/pipeline_integration_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
@@ skipping 103 matching lines @@
  public:
   // Defines the behavior of the "app" that responds to EME events.
   class AppBase {
    public:
     virtual ~AppBase() {}
 
     virtual void OnSessionMessage(const std::string& web_session_id,
                                   const std::vector<uint8>& message,
                                   const GURL& destination_url) = 0;
 
-    virtual void OnSessionReady(const std::string& web_session_id) = 0;
+    virtual void OnSessionClosed(const std::string& web_session_id) = 0;
 
-    virtual void OnSessionClosed(const std::string& web_session_id) = 0;
+    virtual void OnSessionKeysChange(const std::string& web_session_id,
+                                     bool has_additional_usable_key) = 0;
 
     // Errors are not expected unless overridden.
     virtual void OnSessionError(const std::string& web_session_id,
                                 const std::string& error_name,
                                 uint32 system_code,
                                 const std::string& error_message) {
       FAIL() << "Unexpected Key Error";
     }
 
     virtual void NeedKey(const std::string& type,
                          const std::vector<uint8>& init_data,
                          AesDecryptor* decryptor) = 0;
   };
 
   FakeEncryptedMedia(AppBase* app)
       : decryptor_(base::Bind(&FakeEncryptedMedia::OnSessionMessage,
                               base::Unretained(this)),
                    base::Bind(&FakeEncryptedMedia::OnSessionClosed,
+                              base::Unretained(this)),
+                   base::Bind(&FakeEncryptedMedia::OnSessionKeysChange,
                               base::Unretained(this))),
         app_(app) {}
 
   AesDecryptor* decryptor() {
     return &decryptor_;
   }
 
   // Callbacks for firing session events. Delegate to |app_|.
   void OnSessionMessage(const std::string& web_session_id,
                         const std::vector<uint8>& message,
                         const GURL& destination_url) {
     app_->OnSessionMessage(web_session_id, message, destination_url);
   }
 
-  void OnSessionReady(const std::string& web_session_id) {
-    app_->OnSessionReady(web_session_id);
-  }
-
   void OnSessionClosed(const std::string& web_session_id) {
     app_->OnSessionClosed(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 OnSessionError(const std::string& web_session_id,
                       const std::string& error_name,
                       uint32 system_code,
                       const std::string& error_message) {
     app_->OnSessionError(
         web_session_id, error_name, system_code, error_message);
   }
 
   void NeedKey(const std::string& type,
                const std::vector<uint8>& init_data) {
@@ skipping 52 matching lines @@
   }
 
   virtual void OnSessionMessage(const std::string& web_session_id,
                                 const std::vector<uint8>& message,
                                 const GURL& destination_url) OVERRIDE {
     EXPECT_FALSE(web_session_id.empty());
     EXPECT_FALSE(message.empty());
     EXPECT_EQ(current_session_id_, web_session_id);
   }
 
-  virtual void OnSessionReady(const std::string& web_session_id) OVERRIDE {
-    EXPECT_EQ(current_session_id_, web_session_id);
-  }
-
   virtual void OnSessionClosed(const std::string& web_session_id) OVERRIDE {
     EXPECT_EQ(current_session_id_, web_session_id);
   }
 
+  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 NeedKey(const std::string& type,
                        const std::vector<uint8>& init_data,
                        AesDecryptor* decryptor) OVERRIDE {
     if (current_session_id_.empty()) {
       decryptor->CreateSession(type,
                                kInitData,
                                arraysize(kInitData),
                                MediaKeys::TEMPORARY_SESSION,
                                CreateSessionPromise(RESOLVED));
       EXPECT_FALSE(current_session_id_.empty());
@@ skipping 97 matching lines @@
 class NoResponseApp : public FakeEncryptedMedia::AppBase {
  public:
   virtual void OnSessionMessage(const std::string& web_session_id,
                                 const std::vector<uint8>& message,
                                 const GURL& default_url) OVERRIDE {
     EXPECT_FALSE(web_session_id.empty());
     EXPECT_FALSE(message.empty());
     FAIL() << "Unexpected Message";
   }
 
-  virtual void OnSessionReady(const std::string& web_session_id) OVERRIDE {
-    EXPECT_FALSE(web_session_id.empty());
-    FAIL() << "Unexpected Ready";
-  }
-
   virtual void OnSessionClosed(const std::string& web_session_id) OVERRIDE {
     EXPECT_FALSE(web_session_id.empty());
     FAIL() << "Unexpected Closed";
   }
 
+  virtual void OnSessionKeysChange(const std::string& web_session_id,
+                                   bool has_additional_usable_key) OVERRIDE {
+    EXPECT_FALSE(web_session_id.empty());
+    EXPECT_EQ(has_additional_usable_key, true);
+  }
+
   virtual void NeedKey(const std::string& type,
                        const std::vector<uint8>& init_data,
                        AesDecryptor* decryptor) OVERRIDE {
   }
 };
 
 // Helper class that emulates calls made on the ChunkDemuxer by the
 // Media Source API.
 class MockMediaSource {
  public:
@@ skipping 1217 matching lines @@
 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
   ASSERT_TRUE(
       Start(GetTestDataFilePath("nonzero-start-time.webm"), PIPELINE_OK));
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
   ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
             demuxer_->GetStartTime());
 }
 
 }  // namespace media