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()); |
- } |
#endif // defined(OS_ANDROID) |
cast_browser_process_->SetConnectivityChecker( |