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

content/browser/media/android/browser_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_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 124 matching lines @@
   virtual void OnSetVolume(int player_id, double volume);
   virtual void OnSetPoster(int player_id, const GURL& poster);
   virtual void OnReleaseResources(int player_id);
   virtual void OnDestroyPlayer(int player_id);
   virtual void ReleaseFullscreenPlayer(media::MediaPlayerAndroid* player);
   void OnInitializeCDM(int media_keys_id,
                        const std::vector<uint8>& uuid,
                        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,
                        const std::vector<uint8>& response);
   void OnReleaseSession(int media_keys_id, uint32 session_id);
   void OnSetMediaKeys(int player_id, int media_keys_id);
   void OnDestroyCdm(int media_keys_id);
 
   // Cancels all pending session creations associated with |media_keys_id|.
   void CancelAllPendingSessionCreations(int media_keys_id);
@@ skipping 20 matching lines @@
   // |frame_url|.
   void AddDrmBridge(int media_keys_id,
                     const std::vector<uint8>& uuid,
                     const GURL& frame_url);
 
   // Removes the DRM bridge with the specified id.
   void RemoveDrmBridge(int media_keys_id);
 
  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.
   void CreateSessionIfPermitted(int media_keys_id,
                                 uint32 session_id,
                                 const std::string& content_type,
                                 const std::vector<uint8>& init_data,
                                 bool permitted);
 
   // Constructs a MediaPlayerAndroid object. Declared static to permit embedders
@@ skipping 45 matching lines @@
   scoped_ptr<media::MediaResourceGetter> media_resource_getter_;
 
   base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_