Revert of Revert of Chromecast: Play audio streams not supported by CMA via default renderer

chromecast/renderer/cast_content_renderer_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/renderer/cast_content_renderer_client.h"
 
 #include <sys/sysinfo.h>
 
 #include "base/command_line.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "chromecast/common/chromecast_switches.h"
 #include "chromecast/crash/cast_crash_keys.h"
 #include "chromecast/renderer/cast_media_load_deferrer.h"
 #include "chromecast/renderer/cast_render_process_observer.h"
 #include "chromecast/renderer/key_systems_cast.h"
-#include "chromecast/renderer/media/cma_media_renderer_factory.h"
+#include "chromecast/renderer/media/chromecast_media_renderer_factory.h"
 #include "components/network_hints/renderer/prescient_networking_dispatcher.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "crypto/nss_util.h"
 #include "ipc/message_filter.h"
 #include "third_party/WebKit/public/platform/WebColor.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
 #include "third_party/WebKit/public/web/WebView.h"
@@ skipping 126 matching lines @@
 #if !defined(OS_ANDROID)
 scoped_ptr<::media::RendererFactory>
 CastContentRendererClient::CreateMediaRendererFactory(
     ::content::RenderFrame* render_frame,
     const scoped_refptr<::media::MediaLog>& media_log) {
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline))
     return nullptr;
 
   return scoped_ptr<::media::RendererFactory>(
-      new chromecast::media::CmaMediaRendererFactory(
-          render_frame->GetRoutingID()));
+      new chromecast::media::ChromecastMediaRendererFactory(
+          media_log, render_frame->GetRoutingID()));
 }
 #endif
 
 blink::WebPrescientNetworking*
 CastContentRendererClient::GetPrescientNetworking() {
   return prescient_networking_dispatcher_.get();
 }
 
 void CastContentRendererClient::DeferMediaLoad(
     content::RenderFrame* render_frame,
     const base::Closure& closure) {
   if (!render_frame->IsHidden()) {
     closure.Run();
     return;
   }
 
   // Lifetime is tied to |render_frame| via content::RenderFrameObserver.
   new CastMediaLoadDeferrer(render_frame, closure);
 }
 
 }  // namespace shell
 }  // namespace chromecast