[Chromecast] Plumbs raw audio through CMA backend.

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"
 #include "base/files/scoped_file.h"
 #include "base/i18n/rtl.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromecast/base/cast_paths.h"
 #include "chromecast/base/chromecast_switches.h"
 #include "chromecast/browser/cast_browser_context.h"
 #include "chromecast/browser/cast_browser_main_parts.h"
 #include "chromecast/browser/cast_browser_process.h"
 #include "chromecast/browser/cast_network_delegate.h"
 #include "chromecast/browser/cast_quota_permission_context.h"
 #include "chromecast/browser/cast_resource_dispatcher_host_delegate.h"
 #include "chromecast/browser/geolocation/cast_access_token_store.h"
 #include "chromecast/browser/media/cma_media_pipeline_client.h"
 #include "chromecast/browser/media/cma_message_filter_host.h"
 #include "chromecast/browser/service/cast_service_simple.h"
 #include "chromecast/browser/url_request_context_factory.h"
 #include "chromecast/common/global_descriptors.h"
+#include "chromecast/media/audio/audio_manager_factory.h"
 #include "chromecast/media/base/media_message_loop.h"
 #include "chromecast/public/cast_media_shlib.h"
 #include "chromecast/public/media/media_pipeline_backend.h"
 #include "components/crash/content/app/breakpad_linux.h"
 #include "components/crash/content/browser/crash_handler_host_linux.h"
 #include "components/network_hints/browser/network_hints_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/certificate_request_result_type.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 35 matching lines @@
 
 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));
 }
 
 scoped_ptr<::media::AudioManagerFactory>
 CastContentBrowserClient::CreateAudioManagerFactory() {
-  // Return nullptr. The factory will not be set, and the statically linked
+#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::AudioManagerFactory);

[gunsch, 2015/09/18 21:23:07]

From my understanding of this CL, this removes the need for
CastContentBrowserClientInternal::CreateAudioManagerFactory. Is that correct?

If so, we should remove this API entirely and just have CastBrowserMainParts
create a media::AudioManagerFactory directly instead of passing it through from
here.

[alokp, 2015/09/18 21:42:14]

The internal implementation needs to create a different
AudioManager/AudioManagerFactory.

[gunsch, 2015/09/18 21:57:06]

SGTM.

Nit: prefer '()' when invoking empty constructors

(not in style guide but has been mentioned by several committers and we try to
follow it)

[alokp, 2015/09/18 22:08:49]

Done.

+#endif
 }
 
 #if !defined(OS_ANDROID)
 scoped_refptr<media::CmaMediaPipelineClient>
 CastContentBrowserClient::CreateCmaMediaPipelineClient() {
   return make_scoped_refptr(new media::CmaMediaPipelineClient());
 }
 
 scoped_ptr<::media::BrowserCdmFactory>
 CastContentBrowserClient::CreateBrowserCdmFactory() {
@@ skipping 351 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