Rename EME WD call parameters

content/renderer/media/crypto/proxy_decryptor.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_CRYPTO_PROXY_DECRYPTOR_H_
 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 17 matching lines @@
 namespace content {
 
 #if defined(OS_ANDROID)
 class RendererMediaPlayerManager;
 #endif  // defined(OS_ANDROID)
 
 // ProxyDecryptor is for EME v0.1b only. It should not be used for the WD API.
 // A decryptor proxy that creates a real decryptor object on demand and
 // forwards decryptor calls to it.
 //
-// Now that the Pepper API calls use reference ID to match responses with
-// requests, this class maintains a mapping between reference ID and session ID.
-// Callers of this class expect session IDs in the responses.
+// Now that the Pepper API calls use session ID to match responses with
+// requests, this class maintains a mapping between session ID and web session
+// ID. Callers of this class expect web session IDs in the responses.

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

Can you briefly explain what a session ID is and what a web session ID is?

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

Done.

 //
 // TODO(xhwang): Currently we don't support run-time switching among decryptor
 // objects. Fix this when needed.
 // TODO(xhwang): The ProxyDecryptor is not a Decryptor. Find a better name!
 class ProxyDecryptor {
  public:
   // These are similar to the callbacks in media_keys.h, but pass back the
-  // session ID rather than a reference ID.
+  // web session ID rather than a session ID.

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

s/a/the internal/

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

Done.

   typedef base::Callback<void(const std::string& session_id)> KeyAddedCB;
   typedef base::Callback<void(const std::string& session_id,
                               media::MediaKeys::KeyError error_code,
                               int system_code)> KeyErrorCB;
   typedef base::Callback<void(const std::string& session_id,
                               const std::vector<uint8>& message,
                               const std::string& default_url)> KeyMessageCB;
 
   ProxyDecryptor(
 #if defined(ENABLE_PEPPER_CDMS)
@@ skipping 20 matching lines @@
   // May only be called after InitializeCDM() succeeds.
   bool GenerateKeyRequest(const std::string& type,
                           const uint8* init_data,
                           int init_data_length);
   void AddKey(const uint8* key, int key_length,
               const uint8* init_data, int init_data_length,
               const std::string& session_id);
   void CancelKeyRequest(const std::string& session_id);
 
  private:
-  // This is reference_id <-> session_id map.
+  // This is session_id <-> web_session_id map.

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

remove "This is ". (It's missing an article anyway.)

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

Done.

   typedef std::map<uint32, std::string> SessionIdMap;
 
   // Helper function to create MediaKeys to handle the given |key_system|.
   scoped_ptr<media::MediaKeys> CreateMediaKeys(const std::string& key_system,
                                                const GURL& frame_url);
 
   // Callbacks for firing session events.
-  void OnSessionCreated(uint32 reference_id, const std::string& session_id);
-  void OnSessionMessage(uint32 reference_id,
+  void OnSessionCreated(uint32 session_id, const std::string& web_session_id);
+  void OnSessionMessage(uint32 session_id,
                         const std::vector<uint8>& message,
                         const std::string& default_url);
-  void OnSessionReady(uint32 reference_id);
-  void OnSessionClosed(uint32 reference_id);
-  void OnSessionError(uint32 reference_id,
+  void OnSessionReady(uint32 session_id);
+  void OnSessionClosed(uint32 session_id);
+  void OnSessionError(uint32 session_id,
                       media::MediaKeys::KeyError error_code,
                       int system_code);
 
-  // Helper function to determine reference_id for the provided |session_id|.
-  uint32 LookupReferenceId(const std::string& session_id);
+  // Helper function to determine session_id for the provided |web_session_id|.
+  uint32 LookupReferenceId(const std::string& web_session_id);

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

LookupSessionId

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

Done.

 
-  // Helper function to determine session_id for the provided |reference_id|.
-  // The returned session_id is only valid on the main thread, and should be
+  // Helper function to determine web_session_id for the provided |session_id|.
+  // The returned web_session_id is only valid on the main thread, and should be
   // stored by copy.
-  const std::string& LookupSessionId(uint32 reference_id);
+  const std::string& LookupSessionId(uint32 session_id);

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

Lookup*Web*SessionId

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

Done.

 
   base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;
 
 #if defined(ENABLE_PEPPER_CDMS)
   // Callback for cleaning up a Pepper-based CDM.
   void DestroyHelperPlugin();
 
   // Needed to create the PpapiDecryptor.
   blink::WebMediaPlayerClient* web_media_player_client_;
   blink::WebFrame* web_frame_;
@@ skipping 10 matching lines @@
   KeyAddedCB key_added_cb_;
   KeyErrorCB key_error_cb_;
   KeyMessageCB key_message_cb_;
 
   // Protects the |decryptor_|. Note that |decryptor_| itself should be thread
   // safe as per the Decryptor interface.
   base::Lock lock_;
 
   media::DecryptorReadyCB decryptor_ready_cb_;
 
-  // Reference IDs are used to uniquely track sessions so that CDM callbacks
-  // can get mapped to the correct session ID. Reference ID should be unique
+  // Session IDs are used to uniquely track sessions so that CDM callbacks
+  // can get mapped to the correct session ID. Session ID should be unique
   // per renderer process for debugging purposes.
-  static uint32 next_reference_id_;
+  static uint32 next_session_id_;
 
   SessionIdMap sessions_;
 
   bool is_clear_key_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_