Reland r253665 "Rename MediaKeys*Msg to Cdm*Msg."

content/renderer/media/android/renderer_media_player_manager.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 CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 76 matching lines @@
   virtual void DidCommitCompositorFrame() OVERRIDE;
 #endif  // defined(VIDEO_HOLE)
 
   // Encrypted media related methods.
   void InitializeCDM(int media_keys_id,
                      ProxyMediaKeys* media_keys,
                      const std::vector<uint8>& uuid,
                      const GURL& frame_url);
   void CreateSession(int media_keys_id,
                      uint32 session_id,
-                     MediaKeysHostMsg_CreateSession_Type type,
+                     CdmHostMsg_CreateSession_Type type,
                      const std::vector<uint8>& init_data);
   void UpdateSession(int media_keys_id,
                      uint32 session_id,
                      const std::vector<uint8>& response);
   void ReleaseSession(int media_keys_id, uint32 session_id);
   void DestroyCdm(int media_keys_id);
 
   // Registers and unregisters a WebMediaPlayerAndroid object.
   int RegisterMediaPlayer(WebMediaPlayerAndroid* player);
   void UnregisterMediaPlayer(int player_id);
@@ skipping 83 matching lines @@
 
   // WebFrame of pending fullscreen request.
   blink::WebFrame* pending_fullscreen_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_