[Chromecast] Cleanup the API for creating MediaPipelineBackend.

chromecast/browser/cast_content_browser_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromecast/browser/cast_content_browser_client.h"
 
 #include <string>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 62 matching lines @@
     base::CommandLine* command_line) {
 }
 
 scoped_ptr<CastService> CastContentBrowserClient::CreateCastService(
     content::BrowserContext* browser_context,
     PrefService* pref_service,
     net::URLRequestContextGetter* request_context_getter) {
   return make_scoped_ptr(new CastServiceSimple(browser_context, pref_service));
 }
 
+#if !defined(OS_ANDROID)
 scoped_ptr<::media::AudioManagerFactory>
 CastContentBrowserClient::CreateAudioManagerFactory() {
-#if defined(OS_ANDROID)
-  // Return nullptr. The factory will not be set, and the default
-  // implementation of AudioManager will be used.
-  return scoped_ptr<::media::AudioManagerFactory>();
-#else
   return make_scoped_ptr(new media::CastAudioManagerFactory());
-#endif
 }
 
-#if !defined(OS_ANDROID)
 scoped_refptr<media::CmaMediaPipelineClient>
 CastContentBrowserClient::CreateCmaMediaPipelineClient() {
   return make_scoped_refptr(new media::CmaMediaPipelineClient());
 }
 
 scoped_ptr<::media::BrowserCdmFactory>
 CastContentBrowserClient::CreateBrowserCdmFactory() {
   return make_scoped_ptr(new media::CastBrowserCdmFactory());
 }
-#endif
+#endif  // OS_ANDROID
 
 void CastContentBrowserClient::ProcessExiting() {
   // Finalize CastMediaShlib on media thread to ensure it's not accessed
   // after Finalize.
   media::MediaMessageLoop::GetTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&media::CastMediaShlib::Finalize));
 }
 
 void CastContentBrowserClient::SetMetricsClientId(
     const std::string& client_id) {
 }
 
 void CastContentBrowserClient::RegisterMetricsProviders(
     ::metrics::MetricsService* metrics_service) {
 }
 
 bool CastContentBrowserClient::EnableRemoteDebuggingImmediately() {
   return true;
 }
 
 content::BrowserMainParts* CastContentBrowserClient::CreateBrowserMainParts(
     const content::MainFunctionParams& parameters) {
-  content::BrowserMainParts* parts = new CastBrowserMainParts(
-      parameters, url_request_context_factory_.get(),
-      CreateAudioManagerFactory());
+  content::BrowserMainParts* parts =
+      new CastBrowserMainParts(parameters, url_request_context_factory_.get());
   CastBrowserProcess::GetInstance()->SetCastContentBrowserClient(this);
   return parts;
 }
 
 void CastContentBrowserClient::RenderProcessWillLaunch(
     content::RenderProcessHost* host) {
 #if !defined(OS_ANDROID)
   scoped_refptr<media::CmaMessageFilterHost> cma_message_filter(
       new media::CmaMessageFilterHost(host->GetID(),
                                       CreateCmaMediaPipelineClient()));
@@ skipping 311 matching lines @@
         process_type, dumps_path, false /* upload */);
   // StartUploaderThread() even though upload is diferred.
   // Breakpad-related memory is freed in the uploader thread.
   crash_handler->StartUploaderThread();
   return crash_handler;
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace shell
 }  // namespace chromecast