Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

content/renderer/media/webmediaplayer_proxy_impl_android.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_
 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_
 
 #include <map>
 
 #include "content/public/renderer/render_view_observer.h"
@@ skipping 37 matching lines @@
   virtual void DestroyPlayer(int player_id) OVERRIDE;
   virtual void EnterFullscreen(int player_id) OVERRIDE;
   virtual void ExitFullscreen(int player_id) OVERRIDE;
   virtual void DemuxerReady(
       int player_id,
       const media::MediaPlayerHostMsg_DemuxerReady_Params& params) OVERRIDE;
   virtual void ReadFromDemuxerAck(
       int player_id,
       const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params&) OVERRIDE;
   virtual void GenerateKeyRequest(int player_id,
-                                  const std::string& key_system,
                                   const std::string& type,
                                   const std::vector<uint8>& init_data) OVERRIDE;
   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) OVERRIDE;
   virtual void CancelKeyRequest(int player_id,
-                                const std::string& key_system,
                                 const std::string& session_id) OVERRIDE;
   virtual void DurationChanged(int player_id,
                                const base::TimeDelta& duration) OVERRIDE;
 
 #if defined(GOOGLE_TV)
   virtual void RequestExternalSurface(
       int player_id, const gfx::RectF& geometry) OVERRIDE;
 
   // Methods inherited from RenderViewObserver.
   virtual void DidCommitCompositorFrame() OVERRIDE;
@@ skipping 15 matching lines @@
   void OnDidExitFullscreen(int player_id);
   void OnDidEnterFullscreen(int player_id);
   void OnPlayerPlay(int player_id);
   void OnPlayerPause(int player_id);
   void OnReadFromDemuxer(
       int player_id, media::DemuxerStream::Type type, bool seek_done);
   void OnMediaSeekRequest(int player_id, base::TimeDelta time_to_seek,
                           unsigned seek_request_id);
   void OnMediaConfigRequest(int player_id);
   void OnKeyAdded(int player_id,
-                  const std::string& key_system,
                   const std::string& session_id);
   void OnKeyError(int player_id,
-                  const std::string& key_system,
                   const std::string& session_id,
                   media::MediaKeys::KeyError error_code,
                   int system_code);
   void OnKeyMessage(int player_id,
-                    const std::string& key_system,
                     const std::string& session_id,
                     const std::string& message,
                     const std::string& destination_url);
 
   webkit_media::WebMediaPlayerManagerAndroid* manager_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerProxyImplAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_