Move SessionIdAdapter out of WebContentDecryptionModuleImpl

content/renderer/media/webcontentdecryptionmodule_impl.h

Index: content/renderer/media/webcontentdecryptionmodule_impl.h
diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.h b/content/renderer/media/webcontentdecryptionmodule_impl.h
index 50cf6d11eae973e0bb4b117a138527399dc4c2a7..6ec3a95e30a8d21e029f45e8b990b6804610adb1 100644
--- a/content/renderer/media/webcontentdecryptionmodule_impl.h
+++ b/content/renderer/media/webcontentdecryptionmodule_impl.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
@@ -18,8 +19,8 @@ class MediaKeys;
 
 namespace content {
 
+class CdmSessionAdapter;
 class WebContentDecryptionModuleSessionImpl;
-class SessionIdAdapter;
 
 class WebContentDecryptionModuleImpl
     : public blink::WebContentDecryptionModule {
@@ -40,15 +41,10 @@ class WebContentDecryptionModuleImpl
       blink::WebContentDecryptionModuleSession::Client* client);
 
  private:
-  // Takes ownership of |media_keys| and |adapter|.
-  WebContentDecryptionModuleImpl(scoped_ptr<media::MediaKeys> media_keys,
-                                 scoped_ptr<SessionIdAdapter> adapter);
+  // Takes reference to |adapter|.
+  WebContentDecryptionModuleImpl(scoped_refptr<CdmSessionAdapter> adapter);
 
-  // Called when a WebContentDecryptionModuleSessionImpl is closed.
-  void OnSessionClosed(uint32 session_id);
-
-  scoped_ptr<media::MediaKeys> media_keys_;
-  scoped_ptr<SessionIdAdapter> adapter_;
+  scoped_refptr<CdmSessionAdapter> adapter_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleImpl);
 };