Chromium Code Reviews| 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..449bfe722e4b02e8671b32448015939f1a7f9d22 100644 |
| --- a/chromecast/browser/cast_content_browser_client.cc |
| +++ b/chromecast/browser/cast_content_browser_client.cc |
| @@ -71,8 +71,7 @@ static scoped_ptr<mojo::ShellClient> CreateCastMojoMediaApplication( |
| CastContentBrowserClient* browser_client) { |
| scoped_ptr<::media::MojoMediaClient> mojo_media_client( |
| new media::CastMojoMediaClient( |
| - base::Bind(&CastContentBrowserClient::CreateMediaPipelineBackend, |
| - base::Unretained(browser_client)))); |
| + browser_client->GetCmaMediaPipelineClient())); |
|
alokp
2016/04/01 03:05:16
This change is not needed and will break mojo buil
tianyuwang1
2016/04/01 17:23:19
Reverted this change.
|
| return scoped_ptr<mojo::ShellClient>( |
| new ::media::MojoMediaApplication(std::move(mojo_media_client))); |
| } |
| @@ -109,15 +108,21 @@ scoped_ptr<CastService> CastContentBrowserClient::CreateCastService( |
| scoped_ptr<media::MediaPipelineBackend> |
| CastContentBrowserClient::CreateMediaPipelineBackend( |
| const media::MediaPipelineDeviceParams& params) { |
| - return make_scoped_ptr( |
| - media::MediaPipelineBackendManager::CreateMediaPipelineBackend(params)); |
| + DCHECK(cast_browser_main_parts_); |
| + return cast_browser_main_parts_->media_pipeline_backend_manager() |
| + ->CreateMediaPipelineBackend(params); |
| } |
| media::MediaResourceTracker* |
| CastContentBrowserClient::media_resource_tracker() { |
| return cast_browser_main_parts_->media_resource_tracker(); |
| } |
| -#endif // OS_ANDROID |
| + |
| +media::MediaPipelineBackendManager* |
| +CastContentBrowserClient::media_pipeline_backend_manager() { |
| + return cast_browser_main_parts_->media_pipeline_backend_manager(); |
| +} |
| +#endif // !defined(OS_ANDROID) |
| void CastContentBrowserClient::SetMetricsClientId( |
| const std::string& client_id) { |