media: Remove BrowserCdmFactory inferface.

chromecast/browser/cast_browser_main_parts.cc

Index: chromecast/browser/cast_browser_main_parts.cc
diff --git a/chromecast/browser/cast_browser_main_parts.cc b/chromecast/browser/cast_browser_main_parts.cc
index 4e1ba18a6f21d32b9a5caeb5891e2d6c5b795106..bb9b317f74138a6bb37a468bf8c93f21d4dcddd6 100644
--- a/chromecast/browser/cast_browser_main_parts.cc
+++ b/chromecast/browser/cast_browser_main_parts.cc
@@ -45,7 +45,6 @@
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_factory.h"
-#include "media/base/browser_cdm_factory.h"
 #include "media/base/media.h"
 #include "ui/compositor/compositor_switches.h"
 
@@ -311,12 +310,6 @@ void CastBrowserMainParts::PreMainMessageLoopRun() {
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
 #if defined(OS_ANDROID)
   ::media::SetMediaClientAndroid(new media::CastMediaClientAndroid());
-#else
-  if (cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline)) {
-    scoped_ptr<::media::BrowserCdmFactory> cdm_factory =
-        cast_browser_process_->browser_client()->CreateBrowserCdmFactory();
-    ::media::SetBrowserCdmFactory(cdm_factory.release());
-  }

[halliwell, 2015/11/05 22:20:41]

Our existing behaviour here is to only provide a BrowserCdmFactory if
kEnableCmaMediaPipeline switch is set.

So, seems like we should apply that same check in
CastContentBrowserClient::CreateCdmFactory?

[xhwang, 2015/11/05 23:06:11]

oops, I thought about that but then forgot. Thanks for catching it.

Done.

 #endif  // defined(OS_ANDROID)
 
   cast_browser_process_->SetConnectivityChecker(