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

content/browser/media/android/browser_media_player_manager.h

Index: content/browser/media/android/browser_media_player_manager.h
diff --git a/content/browser/media/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h
index 50eef7f281f6ab9775b3fde3d7498dce1a64470a..93545bc564d49f5f2ce69a65c5590c99b2bd6015 100644
--- a/content/browser/media/android/browser_media_player_manager.h
+++ b/content/browser/media/android/browser_media_player_manager.h
@@ -142,7 +142,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
                        const GURL& frame_url);
   void OnCreateSession(int media_keys_id,
                        uint32 session_id,
-                       MediaKeysHostMsg_CreateSession_Type content_type,
+                       CdmHostMsg_CreateSession_Type content_type,
                        const std::vector<uint8>& init_data);
   void OnUpdateSession(int media_keys_id,
                        uint32 session_id,
@@ -183,7 +183,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
 
  private:
   // If |permitted| is false, it does nothing but send
-  // |MediaKeysMsg_SessionError| IPC message.
+  // |CdmMsg_SessionError| IPC message.
   // The primary use case is infobar permission callback, i.e., when infobar
   // can decide user's intention either from interacting with the actual info
   // bar or from the saved preference.