Introduce CdmFactory interface.

content/renderer/media/webcontentdecryptionmodule_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_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
 
-#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"

[ddorwin, 2014/10/16 20:33:20]

What about this?
Replace with public/platform/WebContentDecryptionModuleResult.h ?

[xhwang, 2014/10/17 00:11:49]

I need this for blink::WebContentDecryptionModule...

 
 namespace blink {
 #if defined(ENABLE_PEPPER_CDMS)
 class WebLocalFrame;
 #endif
 class WebSecurityOrigin;
 }
 
 namespace media {
+class CdmFactory;
 class Decryptor;
 class MediaKeys;
 }
 
 namespace content {
 
 class CdmSessionAdapter;
-#if defined(ENABLE_BROWSER_CDMS)
-class RendererCdmManager;
-#endif
 class WebContentDecryptionModuleSessionImpl;
 
 class WebContentDecryptionModuleImpl
     : public blink::WebContentDecryptionModule {
  public:
   static WebContentDecryptionModuleImpl* Create(
-#if defined(ENABLE_PEPPER_CDMS)
-      blink::WebLocalFrame* frame,
-#elif defined(ENABLE_BROWSER_CDMS)
-      RendererCdmManager* manager,
-#endif
+      const media::CdmFactory& cdm_factory,
       const blink::WebSecurityOrigin& security_origin,
       const base::string16& key_system);
 
   virtual ~WebContentDecryptionModuleImpl();
 
   // Returns the Decryptor associated with this CDM. May be NULL if no
   // Decryptor associated with the MediaKeys object.
   // TODO(jrummell): Figure out lifetimes, as WMPI may still use the decryptor
   // after WebContentDecryptionModule is freed. http://crbug.com/330324
   media::Decryptor* GetDecryptor();
 
 #if defined(ENABLE_BROWSER_CDMS)
   // Returns the CDM ID associated with this object. May be kInvalidCdmId if no
   // CDM ID is associated, such as when Clear Key is used.
   int GetCdmId() const;
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
   // blink::WebContentDecryptionModule implementation.
   virtual blink::WebContentDecryptionModuleSession* createSession();
   // TODO(jrummell): Remove this method once blink updated.
   virtual blink::WebContentDecryptionModuleSession* createSession(
       blink::WebContentDecryptionModuleSession::Client* client);
 
   virtual void setServerCertificate(
       const uint8* server_certificate,
       size_t server_certificate_length,
       blink::WebContentDecryptionModuleResult result);

[ddorwin, 2014/10/16 20:33:20]

ICWYU

[xhwang, 2014/10/17 00:11:49]

Done.

 
  private:
   // Takes reference to |adapter|.
   WebContentDecryptionModuleImpl(scoped_refptr<CdmSessionAdapter> adapter);
 
   scoped_refptr<CdmSessionAdapter> adapter_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleImpl);
 };
 
 // Allow typecasting from blink type as this is the only implementation.
 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl(
     blink::WebContentDecryptionModule* cdm) {
   return static_cast<WebContentDecryptionModuleImpl*>(cdm);
 }
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_