Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

media/base/android/media_source_player_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/android/media_codec_bridge.h"
 #include "media/base/android/media_player_manager.h"
@@ skipping 37 matching lines @@
   }
   virtual void OnMediaSeekRequest(int player_id, base::TimeDelta time_to_seek,
                                   unsigned seek_request_id) OVERRIDE {
     last_seek_request_id_ = seek_request_id;
   }
   virtual void OnMediaConfigRequest(int player_id) OVERRIDE {}
   virtual media::MediaDrmBridge* GetDrmBridge(int media_keys_id) OVERRIDE {
     return NULL;
   }
   virtual void OnKeyAdded(int key_id,
-                          const std::string& key_system,
                           const std::string& session_id) OVERRIDE {}
   virtual void OnKeyError(int key_id,
-                          const std::string& key_system,
                           const std::string& session_id,
                           media::MediaKeys::KeyError error_code,
                           int system_code) OVERRIDE {}
   virtual void OnKeyMessage(int key_id,
-                            const std::string& key_system,
                             const std::string& session_id,
                             const std::string& message,
                             const std::string& destination_url) OVERRIDE {}
 
   int num_requests() { return num_requests_; }
   unsigned last_seek_request_id() { return last_seek_request_id_; }
 
  private:
   // The number of request this object sents for decoding data.
   int num_requests_;
@@ skipping 156 matching lines @@
   EXPECT_TRUE(NULL == GetMediaDecoderJob(false));
   EXPECT_EQ(1u, manager_->last_seek_request_id());
 
   // Send the seek ack, player should start requesting data afterwards.
   player_->OnSeekRequestAck(manager_->last_seek_request_id());
   EXPECT_TRUE(NULL != GetMediaDecoderJob(false));
   EXPECT_EQ(1, manager_->num_requests());
 }
 
 }  // namespace media