| Index: chromecast/browser/media/cast_browser_cdm_factory.cc
|
| diff --git a/chromecast/browser/media/cast_browser_cdm_factory.cc b/chromecast/browser/media/cast_browser_cdm_factory.cc
|
| index c657a691ddfe159fff3081b444ee1d1e546a20f5..c04ef522321cc6a02e3eaf77b66801e805abefb4 100644
|
| --- a/chromecast/browser/media/cast_browser_cdm_factory.cc
|
| +++ b/chromecast/browser/media/cast_browser_cdm_factory.cc
|
| @@ -7,7 +7,6 @@
|
| #include "base/bind.h"
|
| #include "base/location.h"
|
| #include "base/single_thread_task_runner.h"
|
| -#include "chromecast/media/base/media_message_loop.h"
|
| #include "chromecast/media/cdm/browser_cdm_cast.h"
|
| #include "media/base/bind_to_current_loop.h"
|
| #include "media/base/cdm_config.h"
|
| @@ -16,6 +15,13 @@
|
| namespace chromecast {
|
| namespace media {
|
|
|
| +CastBrowserCdmFactory::CastBrowserCdmFactory(
|
| + scoped_refptr<base::SingleThreadTaskRunner> task_runner)
|
| + : task_runner_(task_runner) {
|
| + DCHECK(task_runner_);
|
| +}
|
| +CastBrowserCdmFactory::~CastBrowserCdmFactory() {}
|
| +
|
| void CastBrowserCdmFactory::Create(
|
| const std::string& key_system,
|
| const GURL& security_origin,
|
| @@ -48,7 +54,7 @@ void CastBrowserCdmFactory::Create(
|
| return;
|
| }
|
|
|
| - MediaMessageLoop::GetTaskRunner()->PostTask(
|
| + task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&BrowserCdmCast::Initialize,
|
| base::Unretained(browser_cdm.get()),
|
| @@ -58,8 +64,7 @@ void CastBrowserCdmFactory::Create(
|
| ::media::BindToCurrentLoop(session_keys_change_cb),
|
| ::media::BindToCurrentLoop(session_expiration_update_cb)));
|
|
|
| - bound_cdm_created_cb.Run(
|
| - new BrowserCdmCastUi(browser_cdm, MediaMessageLoop::GetTaskRunner()), "");
|
| + bound_cdm_created_cb.Run(new BrowserCdmCastUi(browser_cdm, task_runner_), "");
|
| }
|
|
|
| scoped_refptr<BrowserCdmCast> CastBrowserCdmFactory::CreatePlatformBrowserCdm(
|
|
|