Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

media/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/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
 import("//media/media_options.gni")
 import("//ppapi/features/features.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
 import("//third_party/ffmpeg/ffmpeg_options.gni")
 
 buildflag_header("media_features") {
   header = "media_features.h"
 
   flags = [
     "ENABLE_AC3_EAC3_AUDIO_DEMUXING=$enable_ac3_eac3_audio_demuxing",
     "ENABLE_CBCS_ENCRYPTION_SCHEME=$enable_cbcs_encryption_scheme",
     "ENABLE_HEVC_DEMUXING=$enable_hevc_demuxing",
     "ENABLE_HLS_SAMPLE_AES=$enable_hls_sample_aes",
     "ENABLE_MSE_MPEG2TS_STREAM_PARSER=$enable_mse_mpeg2ts_stream_parser",
     "ENABLE_MEDIA_REMOTING=$enable_media_remoting",
     "ENABLE_WEBRTC=$enable_webrtc",
-    "USE_PROPRIETARY_CODECS=$proprietary_codecs",
   ]
 }
 
 if (proprietary_codecs && media_use_ffmpeg) {
   assert(
       ffmpeg_branding != "Chromium",
       "proprietary codecs and ffmpeg_branding set to Chromium are incompatible")
 }
 
 # Common configuration for targets in the media directory.
@@ skipping 229 matching lines @@
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
   all_dependent_configs = [ ":media_dependent_config" ]
 
   allow_circular_includes_from = []
   cflags = []
   libs = []
   defines = []
   deps = [
     ":cdm_api",
-    "//base",
-    "//base:i18n",
-    "//base/third_party/dynamic_annotations",
-    "//crypto",
-    "//crypto:platform",
-    "//gpu/command_buffer/client:gles2_interface",
-    "//gpu/command_buffer/common",
-    "//skia",
-    "//third_party/libwebm",
-    "//third_party/libyuv",
-    "//ui/events:events_base",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-    "//ui/gl:gl",
-    "//url",
   ]
 
   public_configs = [ "//third_party/libwebm:libwebm_config" ]
   public_deps = [
     ":filters_common",
-    ":media_features",
-    ":shared_memory_support",
-    "//media/audio",
-    "//media/base",
   ]
 
   include_dirs = [ "." ]
   if (media_use_ffmpeg) {
     public_deps += [ "//media/ffmpeg" ]
     deps += [
       "//third_party/ffmpeg",
       "//third_party/opus",
     ]
     sources += [
@@ skipping 197 matching lines @@
     ]
   }
 
   if (use_udev) {
     deps += [ "//device/udev_linux" ]
     sources += [
       "device_monitors/device_monitor_udev.cc",
       "device_monitors/device_monitor_udev.h",
     ]
   }
+
+  public_deps += [
+    ":media_features",
+    ":shared_memory_support",
+    "//media/audio",
+    "//media/base",
+  ]
+
+  deps += [
+    "//base",
+    "//base:i18n",
+    "//base/third_party/dynamic_annotations",
+    "//crypto",
+    "//crypto:platform",
+    "//gpu/command_buffer/client:gles2_interface",
+    "//gpu/command_buffer/common",
+    "//skia",
+    "//third_party/libwebm",
+    "//third_party/libyuv",
+    "//ui/events:events_base",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//ui/gl:gl",
+    "//url",
+  ]
 }
 
 static_library("cdm_paths") {
   sources = [
     "cdm/cdm_paths.cc",
     "cdm/cdm_paths.h",
   ]
   deps = [
     "//base",
   ]
@@ skipping 424 matching lines @@
   fuzzer_test("media_mp4_avcc_parser_fuzzer") {
     sources = [
       "formats/mp4/mp4_avcc_parser_fuzzer.cc",
     ]
     deps = [
       ":media",
       "//base",
     ]
   }
 }