Introduce CdmFactory interface.

content/renderer/media/cdm_session_adapter.h

 // Copyright 2014 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_CDM_SESSION_ADAPTER_H_
 #define CONTENT_RENDERER_MEDIA_CDM_SESSION_ADAPTER_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/media_keys.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleSession.h"
 
-#if defined(ENABLE_PEPPER_CDMS)
-#include "content/renderer/media/crypto/pepper_cdm_wrapper.h"
-#endif
+class GURL;
 
-class GURL;
+namespace media {
+class CdmFactory;
+}
 
 namespace content {
 
-#if defined(ENABLE_BROWSER_CDMS)
-class RendererCdmManager;
-#endif
-
 class WebContentDecryptionModuleSessionImpl;
 
 // Owns the CDM instance and makes calls from session objects to the CDM.
 // Forwards the web session ID-based callbacks of the MediaKeys interface to the
 // appropriate session object. Callers should hold references to this class
 // as long as they need the CDM instance.
 class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
  public:
   CdmSessionAdapter();
 
   // Returns true on success.
-  bool Initialize(
-#if defined(ENABLE_PEPPER_CDMS)
-      const CreatePepperCdmCB& create_pepper_cdm_cb,
-#elif defined(ENABLE_BROWSER_CDMS)
-      RendererCdmManager* manager,
-#endif
-      const std::string& key_system,
-      const GURL& security_origin);
+  bool Initialize(scoped_ptr<media::CdmFactory> cdm_factory,
+                  const std::string& key_system,
+                  const GURL& security_origin);
 
   // Provides a server certificate to be used to encrypt messages to the
   // license server.
   void SetServerCertificate(const uint8* server_certificate,
                             int server_certificate_length,
                             scoped_ptr<media::SimpleCdmPromise> promise);
 
   // Creates a new session and adds it to the internal map. The caller owns the
   // created session. RemoveSession() must be called when destroying it, if
   // RegisterSession() was called.
@@ skipping 95 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<CdmSessionAdapter> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmSessionAdapter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CDM_SESSION_ADAPTER_H_