Remove kDisableUnifiedMediaPipeline

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 814 matching lines @@
   // in the UMA metric.
   file.Close();
   return save_status;
 }
 
 #if defined(OS_ANDROID)
 // Returns true if WMPI should be used for playback, false otherwise.
 //
 // Note that HLS and MP4 detection are pre-redirect and path-based. It is
 // possible to load such a URL and find different content.
 bool UseWebMediaPlayerImpl(const GURL& url) {

[watk, 2017/02/08 00:52:30]

This needs updating to talk about the renderer and not WMP?

[tguilbert, 2017/02/09 02:32:17]

Done.

   // Always use WMPI for playing blob URLs since WMPA could never play them very

[xhwang, 2017/02/08 02:46:01]

Drop any reference to WMPA, here and in
https://cs.chromium.org/search/?q=WMPA+package:%5Echromium$&type=cs

[tguilbert, 2017/02/09 02:32:17]

I have dropped the references here. However, for the remaining TODOs, there are
follow up CLs in which dropping references to WMPA will make more sense (when I
actually complete the TODOs).

   // well and no longer has support for MSE based playbacks.
   if (url.SchemeIsBlob())
     return true;
 
   // WMPI does not support HLS.
   if (media::MediaCodecUtil::IsHLSURL(url))
     return false;
 
   // Don't use WMPI if the container likely contains a codec we can't decode in
   // software and platform decoders are not available.
   if (!media::HasPlatformDecoderSupport()) {
     // Assume that "mp4" means H264. Without platform decoder support we cannot
     // play it with Spitzer, thus fall back to AVDA. http://crbug.com/642988.
     if (base::ToLowerASCII(url.spec()).find("mp4") != std::string::npos)
       return false;
   }
 
   // Indicates if the Android MediaPlayer should be used instead of WMPI.
   if (GetContentClient()->renderer()->ShouldUseMediaPlayerForURL(url))
     return false;
 
-  // Otherwise enable WMPI if indicated via experiment or command line.
-  return media::IsUnifiedMediaPipelineEnabled();
+  // Otherwise, use WMPI.
+  return true;
 }
 #endif  // defined(OS_ANDROID)
 
-#if defined(ENABLE_MOJO_CDM)
-// Returns whether mojo CDM should be used at runtime. Note that even when mojo
-// CDM is enabled at compile time (ENABLE_MOJO_CDM is defined), there are cases
-// where we want to choose other CDM types. For example, in the future, when we
-// experiment mojo CDM on desktop, we will choose between mojo CDM and pepper
-// CDM at runtime.
-// TODO(xhwang): Remove this when we use mojo CDM for all remote CDM cases by
-// default.
-bool UseMojoCdm() {
-#if defined(OS_ANDROID)
-  return media::IsUnifiedMediaPipelineEnabled();
-#else
-  return true;
-#endif
-}
-#endif  // defined(ENABLE_MOJO_CDM)
-
 double ConvertToBlinkTime(const base::TimeTicks& time_ticks) {
   return (time_ticks - base::TimeTicks()).InSecondsF();
 }
 
 }  // namespace
 
 struct RenderFrameImpl::PendingFileChooser {
   PendingFileChooser(const FileChooserParams& p,
                      blink::WebFileChooserCompletion* c)
       : params(p), completion(c) {}
@@ skipping 5629 matching lines @@
     GetRemoteInterfaces()->GetInterface(&remoter_factory_);
   return remoter_factory_.get();
 }
 #endif
 
 media::CdmFactory* RenderFrameImpl::GetCdmFactory() {
   if (cdm_factory_)
     return cdm_factory_.get();
 
 #if defined(ENABLE_MOJO_CDM)
-  if (UseMojoCdm()) {
-    cdm_factory_.reset(new media::MojoCdmFactory(GetMediaInterfaceProvider()));
-    return cdm_factory_.get();
-  }
+  cdm_factory_.reset(new media::MojoCdmFactory(GetMediaInterfaceProvider()));
+  return cdm_factory_.get();
 #endif  //  defined(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)
   cdm_factory_.reset(new media::remoting::RemotingCdmFactory(
@@ skipping 265 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content