Revert of Move ENABLE_PEPPER_CDMS to a buildflag header.

media/base/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("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//media/media_options.gni")
@@ skipping 242 matching lines @@
     "video_util.cc",
     "video_util.h",
     "wall_clock_time_source.cc",
     "wall_clock_time_source.h",
     "yuv_convert.cc",
     "yuv_convert.h",
   ]
 
   allow_circular_includes_from = []
   defines = []
-  public_deps = [
-    "//ppapi/features",
-  ]
+  public_deps = []
   deps = [
     "//base/third_party/dynamic_annotations:dynamic_annotations",
     "//gpu",
     "//media:media_features",
     "//media:shared_memory_support",
     "//skia",
     "//third_party/libyuv",
     "//ui/events:events_base",
     "//url:url",
   ]
   libs = []
   configs += [ ":base_config" ]
 
   if (media_use_ffmpeg) {
     if (!is_android) {
       sources += [
         "audio_video_metadata_extractor.cc",
         "audio_video_metadata_extractor.h",
         "media_file_checker.cc",
         "media_file_checker.h",
       ]
       deps += [ "//media:filters_common" ]
     }
 
     deps += [ "//third_party/ffmpeg" ]
   }
 
   if (is_android) {
-    public_deps += [
+    public_deps = [
       "//media/base/android",
       "//media/base/android:media_jni_headers",
     ]
     allow_circular_includes_from += [ "//media/base/android" ]
   }
 
   if (is_linux && use_x11) {
     configs += [
       "//build/config/linux:x11",
       "//build/config/linux:xext",
@@ skipping 147 matching lines @@
   configs += [
     "//build/config/compiler:no_size_t_to_int_warning",
     "//media:media_config",
   ]
   deps = [
     ":test_support",
     "//base/test:test_support",
     "//gpu/command_buffer/common",
     "//media",
     "//media/base/android:anywhere_unittests",
-    "//ppapi/features",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
   # Even if FFmpeg is enabled on Android we don't want these.
   # TODO(watk): Refactor tests that could be made to run on Android.
   if (media_use_ffmpeg && !is_android) {
     sources += [
       "audio_video_metadata_extractor_unittest.cc",
@@ skipping 114 matching lines @@
 
 fuzzer_test("media_container_names_fuzzer") {
   sources = [
     "container_names_fuzzertest.cc",
   ]
   deps = [
     "//base",
     "//media",
   ]
 }