Rename EME WD call parameters

content/renderer/media/webcontentdecryptionmodulesession_impl.h

Index: content/renderer/media/webcontentdecryptionmodulesession_impl.h
diff --git a/content/renderer/media/webcontentdecryptionmodulesession_impl.h b/content/renderer/media/webcontentdecryptionmodulesession_impl.h
index 68527d00cd91a0a5b5f4451ff29003b5f484eec9..45f40c41b22c0b289b50db9ab994281cf4ca0b50 100644
--- a/content/renderer/media/webcontentdecryptionmodulesession_impl.h
+++ b/content/renderer/media/webcontentdecryptionmodulesession_impl.h
@@ -23,7 +23,7 @@ namespace content {
 class WebContentDecryptionModuleSessionImpl
     : public blink::WebContentDecryptionModuleSession {
  public:
-  typedef base::Callback<void(uint32 reference_id)> SessionClosedCB;
+  typedef base::Callback<void(uint32 session_id)> SessionClosedCB;
 
   WebContentDecryptionModuleSessionImpl(
       media::MediaKeys* media_keys,
@@ -39,12 +39,12 @@ class WebContentDecryptionModuleSessionImpl
   virtual void update(const uint8* response, size_t response_length) OVERRIDE;
   virtual void close() OVERRIDE;
 
-  const std::string& session_id() const { return session_id_; }
+  const std::string& web_session_id() const { return web_session_id_; }

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

Because this is so confusing, I think we should add (somewhat duplicate)
comments to these accessors as well.

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

Is anyone using this? If not, remove it. (This is really a duplicate of
sessionId().)

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

Not used, so removed.

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

No longer used.

 
-  uint32 reference_id() const { return reference_id_; }
+  uint32 session_id() const { return session_id_; }

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

I'd prefer to not have this public session_id(), but webcdm_impl.cc uses it.

We might be able to address this by having the ReferenceIdAdapter generate the
IDs and pass them to this class's constructor. Maybe we'll do that in a separate
CL. TODO?

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

Implemented.

 
   // Callbacks.
-  void OnSessionCreated(const std::string& session_id);
+  void OnSessionCreated(const std::string& web_session_id);
   void OnSessionMessage(const std::vector<uint8>& message,
                         const std::string& destination_url);
   void OnSessionReady();
@@ -60,14 +60,14 @@ class WebContentDecryptionModuleSessionImpl
 
   // Session ID is the user visible ID for this session generated by the CDM.

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

Update.
Also, s/user /app-/

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

Done.

   // This value is not set until the CDM calls OnSessionCreated().
-  std::string session_id_;
+  std::string web_session_id_;
 
   // Reference ID is used to uniquely track this object so that CDM callbacks

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

update

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

Done.

   // can get routed to the correct object.
-  const uint32 reference_id_;
+  const uint32 session_id_;
 
   // Reference ID should be unique per renderer process for debugging purposes.
-  static uint32 next_reference_id_;
+  static uint32 next_session_id_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleSessionImpl);
 };