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

media/media_options.gni

 # 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.
 
 import("//build/config/chromecast_build.gni")
 import("//build/config/features.gni")
-import("//ppapi/features/features.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 
 declare_args() {
   # Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
   # using dlopen. This helps with automated detection of ABI mismatches and
   # prevents silent errors.
   link_pulseaudio = false
 
   # Enable usage of FFmpeg within the media library. Used for most software
   # based decoding, demuxing, and sometimes optimized FFTs. If disabled,
@@ skipping 80 matching lines @@
   # hardware decoders. To do so, you will also need to update ffmpeg build files
   # in order to define which decoders to build in.
   disable_ffmpeg_video_decoders = !media_use_ffmpeg || is_android
 }
 
 declare_args() {
   # Experiment to enable mojo media services (e.g. "renderer", "cdm", see
   # |mojo_media_services|). When enabled, selected mojo paths will be enabled in
   # the media pipeline and corresponding services will hosted in the selected
   # remote process (e.g. "utility" process, see |mojo_media_host|).
-  enable_mojo_media = is_android || is_chromecast || enable_pepper_cdms
+  enable_mojo_media = is_android || is_chromecast
 
   # Enable the TestMojoMediaClient to be used in mojo MediaService. This is for
   # testing only and will override the default platform MojoMediaClient, if any.
   enable_test_mojo_media_client = false
 
   # When enabled, this feature allows developers to use a runtime flag to
   # choose the implementation of the renderer that is used. On a build which
   # enables the mojo renderer, if --disable-mojo-renderer is passed at start-up,
   # the "default" renderer will be used instead. Both renderer implementations
   # will be linked if this feature is enabled, increasing the binary size. This
@@ skipping 40 matching lines @@
         "renderer",
       ]
       mojo_media_host = "browser"
     } else if (is_android) {
       # Both chrome for Android and cast for ATV belongs to this case
       mojo_media_services = [
         "cdm",
         "audio_decoder",
       ]
       mojo_media_host = "gpu"
-    } else if (enable_pepper_cdms) {
-      # TODO(xhwang): Also support running "video_decoder" service in the "gpu"
-      # process. See http://crbug.com/664364
-      mojo_media_services = [ "cdm" ]
-      mojo_media_host = "utility"
+    } else {
+      mojo_media_services = [ "video_decoder" ]
+      mojo_media_host = "gpu"
     }
   }
 }
 
 declare_args() {
   # This switch defines whether the Media Remoting implementation will be built.
   # When enabled, media is allowed to be renderer and played back on remote
   # devices when the tab is being casted and other conditions are met.
   enable_media_remoting = !is_chromecast && !is_ios && !is_android
 }