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

content/utility/BUILD.gn

Index: content/utility/BUILD.gn
diff --git a/content/utility/BUILD.gn b/content/utility/BUILD.gn
index c5d9450965d650d70f9e40ae8cc99799357058b2..0d8806ddf4d54e04ce3c08277d2fd36e0a5e644e 100644
--- a/content/utility/BUILD.gn
+++ b/content/utility/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//media/media_options.gni")
+import("//ppapi/features/features.gni")
 
 source_set("utility") {
   # Only the public target should depend on this. All other targets (even
@@ -34,7 +34,6 @@
     "//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",
@@ -53,8 +52,16 @@
     "//url",
   ]
 
-  if (mojo_media_host == "utility") {
-    deps += [ "//media/mojo/services" ]
+  # 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",
+    ]
   }
 }