Move SessionIdAdapter out of WebContentDecryptionModuleImpl

content/renderer/media/webcontentdecryptionmodulesession_impl.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_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #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"
 
 namespace media {
 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.
   virtual blink::WebString sessionId() const;
   virtual void initializeNewSession(const blink::WebString& mime_type,
                                     const uint8* init_data,
                                     size_t init_data_length);
   virtual void update(const uint8* response, size_t response_length);
   virtual void release();
 
   // Callbacks.
   void OnSessionCreated(const std::string& web_session_id);
   void OnSessionMessage(const std::vector<uint8>& message,
                         const std::string& destination_url);
   void OnSessionReady();
   void OnSessionClosed();
   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_;
 
   // Session ID is used to uniquely track this object so that CDM callbacks
   // can get routed to the correct object.
   const uint32 session_id_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleSessionImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULESESSION_IMPL_H_