| Index: chromecast/browser/cast_content_browser_client.cc
|
| diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc
|
| index dc5902ac7e67d80b42745ebef9874ac48bb4bbe7..d5e779d3774377dfe8798e1668c521b0bd1dd994 100644
|
| --- a/chromecast/browser/cast_content_browser_client.cc
|
| +++ b/chromecast/browser/cast_content_browser_client.cc
|
| @@ -71,6 +71,7 @@ static scoped_ptr<mojo::ShellClient> CreateCastMojoMediaApplication(
|
| CastContentBrowserClient* browser_client) {
|
| scoped_ptr<::media::MojoMediaClient> mojo_media_client(
|
| new media::CastMojoMediaClient(
|
| + browser_client->GetMediaTaskRunner(),
|
| base::Bind(&CastContentBrowserClient::CreateMediaPipelineBackend,
|
| base::Unretained(browser_client))));
|
| return scoped_ptr<mojo::ShellClient>(
|
| @@ -106,6 +107,12 @@ scoped_ptr<CastService> CastContentBrowserClient::CreateCastService(
|
| }
|
|
|
| #if !defined(OS_ANDROID)
|
| +scoped_refptr<base::SingleThreadTaskRunner>
|
| +CastContentBrowserClient::GetMediaTaskRunner() {
|
| + DCHECK(cast_browser_main_parts_);
|
| + return cast_browser_main_parts_->GetMediaTaskRunner();
|
| +}
|
| +
|
| scoped_ptr<media::MediaPipelineBackend>
|
| CastContentBrowserClient::CreateMediaPipelineBackend(
|
| const media::MediaPipelineDeviceParams& params) {
|
| @@ -163,12 +170,6 @@ void CastContentBrowserClient::RenderProcessWillLaunch(
|
| base::Unretained(this), host->GetID()));
|
| }
|
|
|
| -scoped_refptr<base::SingleThreadTaskRunner>
|
| -CastContentBrowserClient::GetMediaTaskRunner() {
|
| - DCHECK(cast_browser_main_parts_);
|
| - return cast_browser_main_parts_->GetMediaTaskRunner();
|
| -}
|
| -
|
| void CastContentBrowserClient::AddNetworkHintsMessageFilter(
|
| int render_process_id, net::URLRequestContext* context) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|