Simplify RFI::CreateMediaPlayer

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 <utility>
 #include <vector>
@@ skipping 2900 matching lines @@
           render_thread->compositor_task_runner(),
           std::move(mojo_media_player_renderer_factory),
           base::Bind(&StreamTextureWrapperImpl::Create,
                      render_thread->EnableStreamTextureCopy(),
                      render_thread->GetStreamTexureFactory(),
                      base::ThreadTaskRunnerHandle::Get())));
 
   factory_selector->SetUseMediaPlayer(UseMediaPlayerRenderer(url));
 #endif  // defined(OS_ANDROID)
 
-  // |factory_type| will be overwritten in all possible path below, and the
-  // DEFAULT value is not accurate. However, this prevents the compiler from
-  // issuing a -Wsometimes-uninitialized warning.
-  // TODO(tguilbert): Remove |factory_type|, and clean up the logic. The work is
-  // already completed and incrementally being submitted. See crbug.com/663503.
-  auto factory_type = media::RendererFactorySelector::FactoryType::DEFAULT;
-  std::unique_ptr<media::RendererFactory> media_renderer_factory;
-
+  bool use_mojo_renderer_factory = false;
 #if defined(ENABLE_MOJO_RENDERER)
 #if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableMojoRenderer)) {
-    media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>(
-        media_log.get(), GetDecoderFactory(),
-        base::Bind(&RenderThreadImpl::GetGpuFactories,
-                   base::Unretained(render_thread)));
+  use_mojo_renderer_factory =
+      !base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableMojoRenderer);
+#else
+  use_mojo_renderer_factory = true;
+#endif  // BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
+  if (use_mojo_renderer_factory) {
+    factory_selector->AddFactory(
+        media::RendererFactorySelector::FactoryType::MOJO,
+        base::MakeUnique<media::MojoRendererFactory>(
+            base::Bind(&RenderThreadImpl::GetGpuFactories,
+                       base::Unretained(render_thread)),
+            GetMediaInterfaceProvider()));
+  }
+#endif  // defined(ENABLE_MOJO_RENDERER)
 
-    factory_type = media::RendererFactorySelector::FactoryType::DEFAULT;
+  if (!use_mojo_renderer_factory) {
+    factory_selector->AddFactory(
+        media::RendererFactorySelector::FactoryType::DEFAULT,
+        base::MakeUnique<media::DefaultRendererFactory>(
+            media_log, GetDecoderFactory(),
+            base::Bind(&RenderThreadImpl::GetGpuFactories,
+                       base::Unretained(render_thread))));
   }
-#endif  // BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
-  if (!media_renderer_factory) {
-    media_renderer_factory = base::MakeUnique<media::MojoRendererFactory>(
-        base::Bind(&RenderThreadImpl::GetGpuFactories,
-                   base::Unretained(render_thread)),
-        GetMediaInterfaceProvider());
-
-    factory_type = media::RendererFactorySelector::FactoryType::MOJO;
-  }
-#else
-  media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>(
-      media_log.get(), GetDecoderFactory(),
-      base::Bind(&RenderThreadImpl::GetGpuFactories,
-                 base::Unretained(render_thread)));
-
-  factory_type = media::RendererFactorySelector::FactoryType::DEFAULT;
-#endif  // defined(ENABLE_MOJO_RENDERER)
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
   auto courier_factory =
       base::MakeUnique<media::remoting::CourierRendererFactory>(
           std::move(remoting_controller));
 
   // base::Unretained is safe here because |factory_selector| owns
   // |courier_factory|.
   factory_selector->SetQueryIsRemotingActiveCB(
       base::Bind(&media::remoting::CourierRendererFactory::IsRemotingActive,
                  base::Unretained(courier_factory.get())));
 
   factory_selector->AddFactory(
       media::RendererFactorySelector::FactoryType::COURIER,
       std::move(courier_factory));
 #endif
 
   if (!url_index_.get() || url_index_->frame() != frame_)
     url_index_.reset(new media::UrlIndex(frame_));
 
-  factory_selector->AddFactory(factory_type, std::move(media_renderer_factory));
-  factory_selector->SetBaseFactoryType(factory_type);

[ncarter (slow), 2017/05/03 23:25:32]

Is it no longer necessary to call SetBaseFactoryType?

[tguilbert, 2017/05/03 23:29:05]

It is! Thank you for catching this!

-
   std::unique_ptr<media::WebMediaPlayerParams> params(
       new media::WebMediaPlayerParams(
           std::move(media_log),
           base::Bind(&ContentRendererClient::DeferMediaLoad,
                      base::Unretained(GetContentClient()->renderer()),
                      static_cast<RenderFrame*>(this),
                      GetWebMediaPlayerDelegate()->has_played_media()),
           audio_renderer_sink, render_thread->GetMediaThreadTaskRunner(),
           render_thread->GetWorkerTaskRunner(),
           render_thread->compositor_task_runner(), context_3d_cb,
@@ skipping 4086 matching lines @@
       policy(info.default_policy),
       replaces_current_history_item(info.replaces_current_history_item),
       history_navigation_in_new_child_frame(
           info.is_history_navigation_in_new_child_frame),
       client_redirect(info.is_client_redirect),
       cache_disabled(info.is_cache_disabled),
       form(info.form),
       source_location(info.source_location) {}
 
 }  // namespace content