Move SessionIdAdapter out of WebContentDecryptionModuleImpl

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 64a12ef1494179cc12b0ebff9d50e06ff85921d4..92acba54cd5d539dd74c09491ba5558464c8c3ce 100644
--- a/content/renderer/media/webcontentdecryptionmodulesession_impl.h
+++ b/content/renderer/media/webcontentdecryptionmodulesession_impl.h
@@ -10,6 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/memory/ref_counted.h"
 #include "media/base/media_keys.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleSession.h"
 #include "third_party/WebKit/public/platform/WebString.h"
@@ -19,17 +20,15 @@ class MediaKeys;
 }
 
 namespace content {
+class CdmSessionIdAdapter;
 
 class WebContentDecryptionModuleSessionImpl
     : public blink::WebContentDecryptionModuleSession {
  public:
-  typedef base::Callback<void(uint32 session_id)> SessionClosedCB;
-
   WebContentDecryptionModuleSessionImpl(
       uint32 session_id,
-      media::MediaKeys* media_keys,
       Client* client,
-      const SessionClosedCB& session_closed_cb);
+      scoped_refptr<CdmSessionIdAdapter> adapter);
   virtual ~WebContentDecryptionModuleSessionImpl();
 
   // blink::WebContentDecryptionModuleSession implementation.
@@ -49,12 +48,12 @@ class WebContentDecryptionModuleSessionImpl
   void OnSessionError(media::MediaKeys::KeyError error_code, int system_code);
 
  private:
+  // Owned pointers.

[ddorwin, 2014/02/18 20:59:42]

Not owned - ref counted. We don't usually call this out. I think we can remove
this comment. See below.

[jrummell, 2014/02/19 00:20:29]

Done.

+  scoped_refptr<CdmSessionIdAdapter> adapter_;
+
   // Non-owned pointers.

[ddorwin, 2014/02/18 20:59:42]

Remove the 's'

[jrummell, 2014/02/19 00:20:29]

Done.

-  media::MediaKeys* media_keys_;
   Client* client_;
 
-  SessionClosedCB session_closed_cb_;
-
   // Web session ID is the app visible ID for this session generated by the CDM.
   // This value is not set until the CDM calls OnSessionCreated().
   blink::WebString web_session_id_;