Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

webkit/renderer/media/android/webmediaplayer_proxy_android.h

 // 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.
 
 #ifndef WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
 #define WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
 
 #include <string>
 
 #include "base/time.h"
@@ skipping 49 matching lines @@
   virtual void DemuxerReady(
       int player_id,
       const media::MediaPlayerHostMsg_DemuxerReady_Params&) = 0;
 
   // Return the data to the media source player when data is ready.
   virtual void ReadFromDemuxerAck(
       int player_id,
       const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) = 0;
 
   virtual void GenerateKeyRequest(int player_id,
-                                  const std::string& key_system,
                                   const std::string& type,
                                   const std::vector<uint8>& init_data) = 0;
 
   virtual void AddKey(int player_id,
-                      const std::string& key_system,
                       const std::vector<uint8>& key,
                       const std::vector<uint8>& init_data,
                       const std::string& session_id) = 0;
 
   virtual void CancelKeyRequest(int player_id,
-                                const std::string& key_system,
                                 const std::string& session_id) = 0;
 
   // Inform the media source player of changed duration from demuxer.
   virtual void DurationChanged(int player_id,
                                const base::TimeDelta& duration) = 0;
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_