Rename EME WD call parameters

media/base/android/media_drm_bridge.h

 // Copyright (c) 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 MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
 
 #include <jni.h>
 #include <map>
 #include <queue>
@@ skipping 43 matching lines @@
                                        const std::string& security_level);
 
   static bool IsCryptoSchemeSupported(const std::vector<uint8>& scheme_uuid,
                                       const std::string& container_mime_type);
 
   static bool IsSecureDecoderRequired(const std::string& security_level_str);
 
   static bool RegisterMediaDrmBridge(JNIEnv* env);
 
   // MediaKeys implementations.
-  virtual bool CreateSession(uint32 reference_id,
+  virtual bool CreateSession(uint32 session_id,
                              const std::string& type,
                              const uint8* init_data,
                              int init_data_length) OVERRIDE;
-  virtual void UpdateSession(uint32 reference_id,
+  virtual void UpdateSession(uint32 session_id,
                              const uint8* response,
                              int response_length) OVERRIDE;
-  virtual void ReleaseSession(uint32 reference_id) OVERRIDE;
+  virtual void ReleaseSession(uint32 session_id) OVERRIDE;
 
   // Returns a MediaCrypto object if it's already created. Returns a null object
   // otherwise.
   base::android::ScopedJavaLocalRef<jobject> GetMediaCrypto();
 
   // Sets callback which will be called when MediaCrypto is ready.
   // If |closure| is null, previously set callback will be cleared.
   void SetMediaCryptoReadyCB(const base::Closure& closure);
 
   // Called after a MediaCrypto object is created.
   void OnMediaCryptoReady(JNIEnv* env, jobject);
 
   // Called after we got the response for GenerateKeyRequest().
   void OnKeyMessage(JNIEnv* env, jobject, jstring j_session_id,
                     jbyteArray message, jstring destination_url);
 
   // Called when key is added.
   void OnKeyAdded(JNIEnv* env, jobject, jstring j_session_id);

[ddorwin, 2013/12/05 00:44:52]

We should comment on j_session_id being a web_session_id. And maybe even rename
it. See comment in .cc file.
ditto below.

 
   // Called when error happens.
   void OnKeyError(JNIEnv* env, jobject, jstring j_session_id);
 
   // Reset the device credentials.
   void ResetDeviceCredentials(const ResetCredentialsCB& callback);
 
   // Called by the java object when credential reset is completed.
   void OnResetDeviceCredentialsCompleted(JNIEnv* env, jobject, bool success);
 
   // Helper function to determine whether a protected surface is needed for the
   // video playback.
   bool IsProtectedSurfaceRequired();
 
   int media_keys_id() const { return media_keys_id_; }
 
   GURL frame_url() const { return frame_url_; }
 
  private:
-  // Map between session_id and reference_id.
+  // Map between session_id and web_session_id.
   typedef std::map<uint32_t, std::string> SessionMap;
 
   static bool IsSecureDecoderRequired(SecurityLevel security_level);
 
   MediaDrmBridge(int media_keys_id,
                  const std::vector<uint8>& scheme_uuid,
                  const GURL& frame_url,
                  const std::string& security_level,
                  MediaPlayerManager* manager);
 
   // Get the security level of the media.
   SecurityLevel GetSecurityLevel();
 
-  // Determine the corresponding reference_id for |session_id|.
-  uint32_t DetermineReferenceId(const std::string& session_id);
+  // Determine the corresponding session_id for |web_session_id|.
+  uint32_t DetermineReferenceId(const std::string& web_session_id);

[ddorwin, 2013/12/05 00:44:52]

Update these function names too. (If it simplifies things, you can do this as a
separate Android-only CL.)

[jrummell, 2013/12/06 23:42:35]

Done.

 
-  // Determine the corresponding session_id for |reference_id|. The returned
+  // Determine the corresponding web_session_id for |session_id|. The returned
   // value is only valid on the main thread, and should be stored by copy.
-  const std::string& LookupSessionId(uint32_t reference_id);
+  const std::string& LookupSessionId(uint32_t session_id);

[xhwang, 2013/12/05 18:51:37]

s/SessionId/WebSessionId/

[jrummell, 2013/12/06 23:42:35]

Done.

 
   // ID of the MediaKeys object.
   int media_keys_id_;
 
   // UUID of the key system.
   std::vector<uint8> scheme_uuid_;
 
   // media stream's frame URL.
   const GURL frame_url_;
 
   // Java MediaDrm instance.
   base::android::ScopedJavaGlobalRef<jobject> j_media_drm_;
 
   // Non-owned pointer.
   MediaPlayerManager* manager_;
 
   base::Closure media_crypto_ready_cb_;
 
   ResetCredentialsCB reset_credentials_cb_;
 
   SessionMap session_map_;
 
   // As the response from GenerateKeyRequest() will be asynchronous, add this
   // request to a queue and assume that the subsequent responses come back in
   // the order issued.
-  // TODO(jrummell): Remove once the Java interface supports reference_id.
-  std::queue<uint32_t> pending_key_request_reference_ids_;
+  // TODO(jrummell): Remove once the Java interface supports session_id.
+  std::queue<uint32_t> pending_key_request_session_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_