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..3a2b2159308fb1bf7ad0a7ca817ae9575e2c85b3 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 CdmSessionAdapter;
 
 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<CdmSessionAdapter> adapter);
   virtual ~WebContentDecryptionModuleSessionImpl();
 
   // blink::WebContentDecryptionModuleSession implementation.
@@ -49,11 +48,10 @@ class WebContentDecryptionModuleSessionImpl
   void OnSessionError(media::MediaKeys::KeyError error_code, int system_code);
 
  private:
-  // Non-owned pointers.
-  media::MediaKeys* media_keys_;
-  Client* client_;
+  scoped_refptr<CdmSessionAdapter> adapter_;
 
-  SessionClosedCB session_closed_cb_;
+  // Non-owned pointer.
+  Client* client_;
 
   // 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().
@@ -63,6 +61,9 @@ class WebContentDecryptionModuleSessionImpl
   // can get routed to the correct object.
   const uint32 session_id_;
 
+  // Is the CDM finished with this session?
+  bool is_closed_;
+
   DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleSessionImpl);
 };