Pass default renderer factory into CreateMediaRendererFactory

content/renderer/render_frame_impl.cc

 // Copyright 2013 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 "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 1909 matching lines @@
       new RenderCdmFactory(GetCdmManager()));
 #else
   scoped_ptr<media::CdmFactory> cdm_factory(new RenderCdmFactory());
 #endif
 
 #if defined(ENABLE_MEDIA_MOJO_RENDERER)
   scoped_ptr<media::RendererFactory> media_renderer_factory(
       new media::MojoRendererFactory(make_scoped_ptr(
           new MediaRendererServiceProvider(GetServiceRegistry()))));
 #else
+  scoped_ptr<media::DefaultRendererFactory> default_factory;
+  default_factory.reset(new media::DefaultRendererFactory(
+      media_log, render_thread->GetGpuFactories(),
+      *render_thread->GetAudioHardwareConfig()));
   scoped_ptr<media::RendererFactory> media_renderer_factory =
-      GetContentClient()->renderer()->CreateMediaRendererFactory(this);
-
-  if (!media_renderer_factory.get()) {
-    media_renderer_factory.reset(new media::DefaultRendererFactory(
-        media_log, render_thread->GetGpuFactories(),
-        *render_thread->GetAudioHardwareConfig()));
-  }
+      GetContentClient()->renderer()->CreateMediaRendererFactory(
+          this, default_factory.Pass());
 #endif  // defined(ENABLE_MEDIA_MOJO_RENDERER)
 
   return new media::WebMediaPlayerImpl(
       frame, client, weak_factory_.GetWeakPtr(), media_renderer_factory.Pass(),
       cdm_factory.Pass(), params);
 #endif  // defined(OS_ANDROID)
 }
 
 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
     blink::WebLocalFrame* frame,
@@ skipping 2491 matching lines @@
 
 #if defined(ENABLE_BROWSER_CDMS)
 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
   if (!cdm_manager_)
     cdm_manager_ = new RendererCdmManager(this);
   return cdm_manager_;
 }
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
 }  // namespace content