| 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 010cc58a288c1e8b0c6f3f3f02fc842c24e7b011..2a8a4e2a0ada249837c363dc8d424e0fa7719f9f 100644
|
| --- a/chromecast/browser/cast_browser_main_parts.cc
|
| +++ b/chromecast/browser/cast_browser_main_parts.cc
|
| @@ -33,6 +33,7 @@
|
| #include "chromecast/common/platform_client_auth.h"
|
| #include "chromecast/media/base/key_systems_common.h"
|
| #include "chromecast/net/connectivity_checker.h"
|
| +#include "chromecast/public/cast_media_shlib.h"
|
| #include "chromecast/public/cast_sys_info.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/gpu_data_manager.h"
|
| @@ -282,10 +283,10 @@ void CastBrowserMainParts::PreMainMessageLoopRun() {
|
| cast_browser_process_->SetPrefService(
|
| PrefServiceHelper::CreatePrefService(pref_registry.get()));
|
|
|
| + const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
|
| #if defined(OS_ANDROID)
|
| ::media::SetMediaClientAndroid(new media::CastMediaClientAndroid());
|
| #else
|
| - const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
|
| if (cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline))
|
| ::media::SetBrowserCdmFactory(new media::CastBrowserCdmFactory());
|
| #endif // defined(OS_ANDROID)
|
| @@ -311,6 +312,8 @@ void CastBrowserMainParts::PreMainMessageLoopRun() {
|
| cast_browser_process_->SetRemoteDebuggingServer(
|
| make_scoped_ptr(new RemoteDebuggingServer()));
|
|
|
| + CastMediaShlib::Initialize(cmd_line->argv());
|
| +
|
| cast_browser_process_->SetCastService(CastService::Create(
|
| cast_browser_process_->browser_context(),
|
| cast_browser_process_->pref_service(),
|
| @@ -368,6 +371,8 @@ void CastBrowserMainParts::PostMainMessageLoopRun() {
|
| cast_browser_process_.reset();
|
| DeregisterKillOnAlarm();
|
| #endif
|
| +
|
| + CastMediaShlib::Finalize();
|
| }
|
|
|
| } // namespace shell
|
|
|