media: Add experimental feature to enable Mojo CDM on desktop Chromium

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 6757 matching lines @@
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
 media::mojom::RemoterFactory* RenderFrameImpl::GetRemoterFactory() {
   if (!remoter_factory_)
     GetRemoteInterfaces()->GetInterface(&remoter_factory_);
   return remoter_factory_.get();
 }
 #endif
 
 media::CdmFactory* RenderFrameImpl::GetCdmFactory() {
+  DCHECK(frame_);
+
   if (cdm_factory_)
     return cdm_factory_.get();
 
-#if BUILDFLAG(ENABLE_MOJO_CDM)
+#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+  static_assert(BUILDFLAG(ENABLE_MOJO_CDM),
+                "Mojo CDM should always be enabled when PPAPI CDM is enabled");
+  if (base::FeatureList::IsEnabled(media::kMojoCdm))
+    cdm_factory_.reset(new media::MojoCdmFactory(GetMediaInterfaceProvider()));
+  else

[jam, 2017/05/24 00:36:33]

nit: brace brackets per style guide

+    cdm_factory_.reset(new RenderCdmFactory(
+        base::Bind(&PepperCdmWrapperImpl::Create, frame_)));
+#elif BUILDFLAG(ENABLE_MOJO_CDM)
   cdm_factory_.reset(new media::MojoCdmFactory(GetMediaInterfaceProvider()));
-  return cdm_factory_.get();
-#endif  //  BUILDFLAG(ENABLE_MOJO_CDM)
-
-#if BUILDFLAG(ENABLE_PEPPER_CDMS)
-  DCHECK(frame_);
-  cdm_factory_.reset(
-      new RenderCdmFactory(base::Bind(&PepperCdmWrapperImpl::Create, frame_)));
 #endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)

[jrummell, 2017/05/23 22:23:28]

Is it possible for cdm_factory_ to get set twice? Should this be first above,
then #elif ENABLE_PEPPER_CDMS?

[xhwang, 2017/05/23 22:31:12]

The RemotingCdmFactory actually wraps the cdm_factory_ set above, so this has to
be after the above block.

   cdm_factory_.reset(new media::remoting::RemotingCdmFactory(
       std::move(cdm_factory_), GetRemoterFactory(),
       std::move(remoting_sink_observer_)));
 #endif  // BUILDFLAG(ENABLE_MEDIA_REMOTING)
 
   return cdm_factory_.get();
 }
 
 media::DecoderFactory* RenderFrameImpl::GetDecoderFactory() {
 #if BUILDFLAG(ENABLE_MOJO_AUDIO_DECODER) || BUILDFLAG(ENABLE_MOJO_VIDEO_DECODER)
@@ skipping 271 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