Commit 2ca77068 authored by gunsch's avatar gunsch Committed by Commit bot

Chromecast: connect CastBrowserCdmFactory during startup.

R=lcwu@chromium.org,erickung@chromium.org
BUG=408189

Review URL: https://codereview.chromium.org/886583002

Cr-Commit-Position: refs/heads/master@{#313552}
parent 97338dbd
...@@ -18,17 +18,20 @@ ...@@ -18,17 +18,20 @@
#include "chromecast/browser/cast_browser_context.h" #include "chromecast/browser/cast_browser_context.h"
#include "chromecast/browser/cast_browser_process.h" #include "chromecast/browser/cast_browser_process.h"
#include "chromecast/browser/devtools/remote_debugging_server.h" #include "chromecast/browser/devtools/remote_debugging_server.h"
#include "chromecast/browser/media/cast_browser_cdm_factory.h"
#include "chromecast/browser/metrics/cast_metrics_prefs.h" #include "chromecast/browser/metrics/cast_metrics_prefs.h"
#include "chromecast/browser/metrics/cast_metrics_service_client.h" #include "chromecast/browser/metrics/cast_metrics_service_client.h"
#include "chromecast/browser/pref_service_helper.h" #include "chromecast/browser/pref_service_helper.h"
#include "chromecast/browser/service/cast_service.h" #include "chromecast/browser/service/cast_service.h"
#include "chromecast/browser/url_request_context_factory.h" #include "chromecast/browser/url_request_context_factory.h"
#include "chromecast/common/cast_paths.h" #include "chromecast/common/cast_paths.h"
#include "chromecast/common/chromecast_switches.h"
#include "chromecast/common/platform_client_auth.h" #include "chromecast/common/platform_client_auth.h"
#include "chromecast/net/network_change_notifier_cast.h" #include "chromecast/net/network_change_notifier_cast.h"
#include "chromecast/net/network_change_notifier_factory_cast.h" #include "chromecast/net/network_change_notifier_factory_cast.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "media/base/browser_cdm_factory.h"
#include "media/base/media_switches.h" #include "media/base/media_switches.h"
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
...@@ -180,6 +183,12 @@ void CastBrowserMainParts::PreMainMessageLoopRun() { ...@@ -180,6 +183,12 @@ void CastBrowserMainParts::PreMainMessageLoopRun() {
cast_browser_process_->SetPrefService( cast_browser_process_->SetPrefService(
PrefServiceHelper::CreatePrefService(pref_registry.get())); PrefServiceHelper::CreatePrefService(pref_registry.get()));
#if !defined(OS_ANDROID)
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
if (cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline))
::media::SetBrowserCdmFactory(new media::CastBrowserCdmFactory);
#endif // !defined(OS_ANDROID)
url_request_context_factory_->InitializeOnUIThread(); url_request_context_factory_->InitializeOnUIThread();
cast_browser_process_->SetBrowserContext( cast_browser_process_->SetBrowserContext(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment