Update Android IPC messages to EME WD

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 75 matching lines @@
 
   // RenderViewObserver overrides.
   virtual void DidCommitCompositorFrame() OVERRIDE;
 #endif
 
   // Encrypted media related methods.
   void InitializeCDM(int media_keys_id,
                      ProxyMediaKeys* media_keys,
                      const std::vector<uint8>& uuid,
                      const GURL& frame_url);
-  void GenerateKeyRequest(int media_keys_id,
-                          uint32 reference_id,
-                          const std::string& type,
-                          const std::vector<uint8>& init_data);
-  void AddKey(int media_keys_id,
-              uint32 reference_id,
-              const std::vector<uint8>& key,
-              const std::vector<uint8>& init_data);
-  void CancelKeyRequest(int media_keys_id, uint32 reference_id);
+  void CreateSession(int media_keys_id,
+                     uint32 reference_id,
+                     const std::string& type,
+                     const std::vector<uint8>& init_data);
+  void UpdateSession(int media_keys_id,
+                     uint32 reference_id,
+                     const std::vector<uint8>& response);
+  void ReleaseSession(int media_keys_id, uint32 reference_id);
 
   // Registers and unregisters a WebMediaPlayerAndroid object.
   int RegisterMediaPlayer(WebMediaPlayerAndroid* player);
   void UnregisterMediaPlayer(int player_id);
 
   // Registers a ProxyMediaKeys object. There must be a WebMediaPlayerAndroid
   // object already registered for this id, and it is unregistered when the
   // player is unregistered. For now |media_keys_id| is the same as player_id
   // used in other methods.
   void RegisterMediaKeys(int media_keys_id, ProxyMediaKeys* media_keys);
@@ skipping 40 matching lines @@
   void OnMediaPlayerReleased(int player_id);
   void OnConnectedToRemoteDevice(int player_id);
   void OnDisconnectedFromRemoteDevice(int player_id);
   void OnDidExitFullscreen(int player_id);
   void OnDidEnterFullscreen(int player_id);
   void OnPlayerPlay(int player_id);
   void OnPlayerPause(int player_id);
   void OnRequestFullscreen(int player_id);
   void OnSessionCreated(int media_keys_id,
                         uint32 reference_id,
-                        const std::string& session_id);
+                        const std::string& web_session_id);
   void OnSessionMessage(int media_keys_id,
                         uint32 reference_id,
                         const std::vector<uint8>& message,
                         const std::string& destination_url);
   void OnSessionReady(int media_keys_id, uint32 reference_id);
   void OnSessionClosed(int media_keys_id, uint32 reference_id);
   void OnSessionError(int media_keys_id,
                       uint32 reference_id,
                       media::MediaKeys::KeyError error_code,
                       int system_code);
@@ skipping 10 matching lines @@
 
   // WebFrame of the fullscreen video.
   blink::WebFrame* fullscreen_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_MEDIA_PLAYER_MANAGER_H_