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

content/utility/BUILD.gn

 # 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("//ppapi/features/features.gni")
+import("//media/media_options.gni")
 
 source_set("utility") {
   # Only the public target should depend on this. All other targets (even
   # internal content ones other than test) should depend on the public one.
   visibility = [
     ":for_content_tests",
     "//content/app:*",
     "//content/public/utility:utility_sources",
   ]
 
@@ skipping 11 matching lines @@
 
   configs += [ "//content:content_implementation" ]
 
   deps = [
     "//base",
     "//content:export",
     "//content/child",
     "//content/network:network_sources",
     "//content/public/child:child_sources",
     "//content/public/common:common_sources",
+    "//media/mojo:features",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//ppapi/features",
     "//sandbox",
     "//services/data_decoder:lib",
     "//services/data_decoder/public/cpp",
     "//services/service_manager",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/interfaces",
     "//services/shape_detection:lib",
     "//services/shape_detection/public/interfaces",
     "//services/video_capture:lib",
     "//services/video_capture/public/interfaces:constants",
     "//third_party/WebKit/public:blink_headers",
     "//third_party/WebKit/public:mojo_bindings",
     "//url",
   ]
 
-  # When pepper CDMs are supported, we also support running the CDM in the
-  # utility process using mojo MediaService.
-  # TODO(xhwang): Replace "enable_pepper_cdms" with a better buildflag. See
-  # http://crbug.com/725394
-  if (enable_pepper_cdms) {
-    deps += [
-      "//media",
-      "//media/mojo:features",
-      "//media/mojo/services",
-    ]
+  if (mojo_media_host == "utility") {
+    deps += [ "//media/mojo/services" ]
   }
 }
 
 # See comment at the top of //content/BUILD.gn for how this works.
 group("for_content_tests") {
   visibility = [ "//content/test/*" ]
   if (!is_component_build) {
     public_deps = [
       ":utility",
     ]
   }
 }