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 3d61b0105c05a155a9c68098b6e8730a6fc7f18b..84438ca87ffaea16a398acbbda4a7fdde6c6ffa2 100644 |
--- a/chromecast/browser/cast_content_browser_client.cc |
+++ b/chromecast/browser/cast_content_browser_client.cc |
@@ -23,6 +23,7 @@ |
#include "chromecast/browser/media/cma_message_filter_host.h" |
#include "chromecast/browser/url_request_context_factory.h" |
#include "chromecast/common/global_descriptors.h" |
+#include "chromecast/media/audio/cast_audio_manager_factory.h" |
#include "chromecast/media/cma/backend/media_pipeline_device.h" |
#include "chromecast/media/cma/backend/media_pipeline_device_factory.h" |
#include "components/crash/app/breakpad_linux.h" |
@@ -38,7 +39,6 @@ |
#include "content/public/common/content_switches.h" |
#include "content/public/common/url_constants.h" |
#include "content/public/common/web_preferences.h" |
-#include "media/audio/audio_manager_factory.h" |
#include "net/ssl/ssl_cert_request_info.h" |
#include "net/url_request/url_request_context_getter.h" |
#include "ui/gl/gl_switches.h" |
@@ -71,13 +71,6 @@ CastContentBrowserClient::GetBrowserMessageFilters() { |
return std::vector<scoped_refptr<content::BrowserMessageFilter>>(); |
} |
-scoped_ptr<::media::AudioManagerFactory> |
-CastContentBrowserClient::CreateAudioManagerFactory() { |
- // Return nullptr. The factory will not be set, and the statically linked |
- // implementation of AudioManager will be used. |
- return scoped_ptr<::media::AudioManagerFactory>(); |
-} |
- |
#if !defined(OS_ANDROID) |
scoped_ptr<media::MediaPipelineDevice> |
CastContentBrowserClient::CreateMediaPipelineDevice( |
@@ -90,9 +83,10 @@ CastContentBrowserClient::CreateMediaPipelineDevice( |
content::BrowserMainParts* CastContentBrowserClient::CreateBrowserMainParts( |
const content::MainFunctionParams& parameters) { |
- return new CastBrowserMainParts(parameters, |
- url_request_context_factory_.get(), |
- CreateAudioManagerFactory()); |
+ return new CastBrowserMainParts( |
+ parameters, |
+ url_request_context_factory_.get(), |
+ make_scoped_ptr(new chromecast::media::CastAudioManagerFactory())); |
} |
void CastContentBrowserClient::RenderProcessWillLaunch( |