Rename EME WD call parameters

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 73 matching lines @@
       int player_id, int width, int height) OVERRIDE;
   virtual void RequestMediaResources(int player_id) OVERRIDE;
   virtual void ReleaseMediaResources(int player_id) OVERRIDE;
   virtual media::MediaResourceGetter* GetMediaResourceGetter() OVERRIDE;
   virtual media::MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE;
   virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE;
   virtual media::MediaDrmBridge* GetDrmBridge(int media_keys_id) OVERRIDE;
   virtual void DestroyAllMediaPlayers() OVERRIDE;
   virtual void OnProtectedSurfaceRequested(int player_id) OVERRIDE;
   virtual void OnSessionCreated(int media_keys_id,
-                                uint32 reference_id,
-                                const std::string& session_id) OVERRIDE;
+                                uint32 session_id,
+                                const std::string& web_session_id) OVERRIDE;
   virtual void OnSessionMessage(int media_keys_id,
-                                uint32 reference_id,
+                                uint32 session_id,
                                 const std::vector<uint8>& message,
                                 const std::string& destination_url) OVERRIDE;
-  virtual void OnSessionReady(int media_keys_id, uint32 reference_id) OVERRIDE;
-  virtual void OnSessionClosed(int media_keys_id, uint32 reference_id) OVERRIDE;
+  virtual void OnSessionReady(int media_keys_id, uint32 session_id) OVERRIDE;
+  virtual void OnSessionClosed(int media_keys_id, uint32 session_id) OVERRIDE;
   virtual void OnSessionError(int media_keys_id,
-                              uint32 reference_id,
+                              uint32 session_id,
                               media::MediaKeys::KeyError error_code,
                               int system_code) OVERRIDE;
 
 #if defined(GOOGLE_TV)
   void AttachExternalVideoSurface(int player_id, jobject surface);
   void DetachExternalVideoSurface(int player_id);
 #endif
 
   // Called to disble the current fullscreen playback if the video is encrypted.
   // TODO(qinmin): remove this once we have the new fullscreen mode.
@@ skipping 15 matching lines @@
   virtual void OnStart(int player_id);
   virtual void OnSeek(int player_id, const base::TimeDelta& time);
   virtual void OnPause(int player_id, bool is_media_related_action);
   virtual void OnSetVolume(int player_id, double volume);
   virtual void OnReleaseResources(int player_id);
   virtual void OnDestroyPlayer(int player_id);
   void OnInitializeCDM(int media_keys_id,
                        const std::vector<uint8>& uuid,
                        const GURL& frame_url);
   void OnGenerateKeyRequest(int media_keys_id,
-                            uint32 reference_id,
+                            uint32 session_id,
                             const std::string& type,
                             const std::vector<uint8>& init_data);
   void OnAddKey(int media_keys_id,
-                uint32 reference_id,
+                uint32 session_id,
                 const std::vector<uint8>& key,
                 const std::vector<uint8>& init_data);
-  void OnCancelKeyRequest(int media_keys_id, uint32 reference_id);
+  void OnCancelKeyRequest(int media_keys_id, uint32 session_id);
   void OnSetMediaKeys(int player_id, int media_keys_id);
 
 #if defined(GOOGLE_TV)
   virtual void OnNotifyExternalSurface(
       int player_id, bool is_request, const gfx::RectF& rect);
 #endif
 
   // Adds a given player to the list.
   void AddPlayer(media::MediaPlayerAndroid* player);
 
@@ skipping 11 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:
   void GenerateKeyIfAllowed(int media_keys_id,
-                            uint32 reference_id,
+                            uint32 session_id,
                             const std::string& type,
                             const std::vector<uint8>& init_data,
                             bool allowed);
 
   // Constructs a MediaPlayerAndroid object. Declared static to permit embedders
   // to override functionality.
   //
   // Objects must call |manager->RequestMediaResources()| before decoding
   // and |manager->ReleaseMediaSources()| after finishing. This allows the
   // manager to track decoding resources across the process and free them as
@@ skipping 40 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_