media: Remove Browser CDM implementation

content/renderer/media/cdm/render_cdm_factory.h

Index: content/renderer/media/cdm/render_cdm_factory.h
diff --git a/content/renderer/media/cdm/render_cdm_factory.h b/content/renderer/media/cdm/render_cdm_factory.h
index f5016e708bc8c6740aed883e7b617ba89032c9d7..1b03c4017a6b8baba9e79b35d8f68134f711059c 100644
--- a/content/renderer/media/cdm/render_cdm_factory.h
+++ b/content/renderer/media/cdm/render_cdm_factory.h
@@ -25,18 +25,12 @@ struct CdmConfig;
 
 namespace content {
 
-#if defined(ENABLE_BROWSER_CDMS)
-class RendererCdmManager;
-#endif
-
 // CdmFactory implementation in content/renderer. This class is not thread safe
 // and should only be used on one thread.
 class RenderCdmFactory : public media::CdmFactory {
  public:
 #if defined(ENABLE_PEPPER_CDMS)
   explicit RenderCdmFactory(const CreatePepperCdmCB& create_pepper_cdm_cb);
-#elif defined(ENABLE_BROWSER_CDMS)
-  explicit RenderCdmFactory(RendererCdmManager* manager);
 #else
   RenderCdmFactory();
 #endif  // defined(ENABLE_PEPPER_CDMS)

[DaleCurtis, 2016/09/30 16:42:29]

Can this one go away soon too? :)

[xhwang, 2016/09/30 17:06:19]

Depending on how you define "soon" :) Yes, this is what we are working on.

@@ -57,9 +51,6 @@ class RenderCdmFactory : public media::CdmFactory {
  private:
 #if defined(ENABLE_PEPPER_CDMS)
   CreatePepperCdmCB create_pepper_cdm_cb_;
-#elif defined(ENABLE_BROWSER_CDMS)
-  // The |manager_| is a per render frame object owned by RenderFrameImpl.
-  RendererCdmManager* manager_;
 #endif
 
   base::ThreadChecker thread_checker_;