Rename buildflag_headers for consistency

This updates media and a couple of other minor ones.

Targets go from foo_features to foo_buildflags
And similarly the header now has buildflags in the name.

BUG=814485
TEST=covered by build
TBR=xhwang@chromium.org (for third_party)

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I2349230b278e3f6e163196fcf03b9b5fa1367e5d
Reviewed-on: https://chromium-review.googlesource.com/975990
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545268}

android_webview/DEPS

@@ -22,7 +22,7 @@ include_rules = [
   "+gpu",
   "+jni",
   # Only this one header in media which doesn't depend on anything else.
-  "+media/media_features.h",
+  "+media/media_buildflags.h",
   "+net",
   "+services/network/public/cpp",
   "+services/viz/public/interfaces",

android_webview/lib/aw_main_delegate.cc

@@ -47,7 +47,7 @@
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/ipc/gl_in_process_context.h"
 #include "media/base/media_switches.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 

cc/BUILD.gn

@@ -373,7 +373,7 @@ cc_component("cc") {
     "//gpu/command_buffer/client:raster_interface",
     "//gpu/ipc:gl_in_process_context",
     "//gpu/skia_bindings:skia_bindings",
-    "//gpu/vulkan:features",
+    "//gpu/vulkan:buildflags",
     "//media",
     "//mojo/public/cpp/bindings:struct_traits",
     "//services/metrics/public/cpp:ukm_builders",

chrome/DEPS

@@ -24,7 +24,7 @@ include_rules = [
   "+components/variations",
   "+content/public/common",
   "+content/public/test",
-  "+media/media_features.h",
+  "+media/media_buildflags.h",
   "+mojo/common",
   "+mojo/public",
   "+ppapi/features",

chrome/browser/BUILD.gn

@@ -1753,11 +1753,11 @@ jumbo_split_static_library("browser") {
     "//google_apis",
     "//gpu/config",
     "//media",
-    "//media:media_features",
+    "//media:media_buildflags",
     "//media/capture",
     "//media/cast:net",
     "//media/midi",
-    "//media/mojo:features",
+    "//media/mojo:buildflags",
     "//media/mojo/common",
     "//media/mojo/interfaces:mirror_service_remoting",
     "//media/mojo/interfaces:remoting",
@@ -3850,7 +3850,7 @@ jumbo_split_static_library("browser") {
     ]
     deps += [
       "//components/pdf/browser",
-      "//media:media_features",
+      "//media:media_buildflags",
       "//ppapi/features",
       "//ppapi/proxy:ipc",
       "//services/device/public/mojom",

chrome/browser/about_flags.cc

@@ -104,7 +104,7 @@
 #include "gpu/config/gpu_switches.h"
 #include "media/audio/audio_features.h"
 #include "media/base/media_switches.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "media/midi/midi_switches.h"
 #include "net/cert/cert_verify_proc_android.h"
 #include "net/nqe/effective_connection_type.h"

chrome/browser/browser_process.h

@@ -20,7 +20,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/shell_integration.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 class BackgroundModeManager;
 class DownloadRequestLimiter;

chrome/browser/browser_process_impl.cc

@@ -126,7 +126,7 @@
 #include "content/public/common/network_connection_tracker.h"
 #include "extensions/buildflags/buildflags.h"
 #include "extensions/common/constants.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ppapi/features/features.h"

chrome/browser/browser_process_impl.h

@@ -27,7 +27,7 @@
 #include "components/nacl/common/buildflags.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "extensions/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/features/features.h"
 #include "printing/features/features.h"
 #include "services/network/public/mojom/network_service.mojom.h"

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h

@@ -23,7 +23,7 @@
 #include "content/public/browser/browsing_data_remover.h"
 #include "content/public/browser/browsing_data_remover_delegate.h"
 #include "extensions/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/features/features.h"
 
 #if BUILDFLAG(ENABLE_PLUGINS)

chrome/browser/chrome_browser_field_trials_desktop.cc

@@ -30,7 +30,7 @@
 #include "components/metrics/persistent_system_profile.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/common/content_switches.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 #if defined(OS_WIN)
 #include "base/win/pe_image.h"

chrome/browser/chrome_browser_main.cc

@@ -179,7 +179,7 @@
 #include "device/vr/buildflags/buildflags.h"
 #include "extensions/buildflags/buildflags.h"
 #include "media/base/localized_strings.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "net/base/net_module.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_network_layer.h"

chrome/browser/chrome_content_browser_client.cc

@@ -232,8 +232,8 @@
 #include "gpu/config/gpu_switches.h"
 #include "media/audio/audio_manager.h"
 #include "media/base/media_switches.h"
-#include "media/media_features.h"
-#include "media/mojo/features.h"
+#include "media/media_buildflags.h"
+#include "media/mojo/buildflags.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 #include "net/base/mime_util.h"
 #include "net/cookies/canonical_cookie.h"

chrome/browser/chrome_content_browser_client.h

@@ -22,7 +22,7 @@
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/resource_type.h"
 #include "extensions/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/features/features.h"
 #include "services/network/public/mojom/network_service.mojom.h"
 #include "services/service_manager/public/cpp/binder_registry.h"

chrome/browser/chrome_content_browser_client_unittest.cc

@@ -35,7 +35,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_browser_thread_bundle.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"

chrome/browser/chromeos/login/chrome_restart_request.cc

@@ -43,7 +43,7 @@
 #include "gpu/ipc/host/gpu_switches.h"
 #include "gpu/ipc/service/switches.h"
 #include "media/base/media_switches.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "services/service_manager/sandbox/switches.h"
 #include "third_party/cros_system_api/switches/chrome_switches.h"
 #include "ui/app_list/app_list_switches.h"

chrome/browser/extensions/BUILD.gn

@@ -866,7 +866,7 @@ static_library("extensions") {
     "//extensions/common/api",
     "//extensions/strings",
     "//google_apis",
-    "//media:media_features",
+    "//media:media_buildflags",
     "//net",
     "//ppapi/features",
     "//printing/features",

chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

@@ -38,7 +38,7 @@
 #include "extensions/common/extension.h"
 #include "extensions/test/result_catcher.h"
 #include "media/base/test_data_util.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"

chrome/browser/extensions/api/preference/preference_api.cc

@@ -47,7 +47,7 @@
 #include "extensions/common/error_utils.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/permissions_data.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/public/cpp/ash_pref_names.h"  // nogncheck

chrome/browser/extensions/api/preference/preference_apitest.cc

@@ -33,7 +33,7 @@
 #include "extensions/browser/test_extension_registry_observer.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 class ExtensionPreferenceApiTest : public ExtensionApiTest {
  protected:

chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.h

@@ -9,7 +9,7 @@
 
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/common/extensions/api/webrtc_logging_private.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 #if BUILDFLAG(ENABLE_WEBRTC)
 #include "chrome/browser/media/webrtc/audio_debug_recordings_handler.h"

chrome/browser/flag_descriptions.h

@@ -12,7 +12,7 @@
 #include "chrome/common/buildflags.h"
 #include "components/nacl/common/buildflags.h"
 #include "device/vr/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 // This file declares strings used in chrome://flags. These messages are not
 // translated, because instead of end-users they target Chromium developers and

chrome/browser/icon_loader_chromeos.cc

@@ -20,7 +20,7 @@
 #include "base/strings/string_util.h"
 #include "chrome/grit/theme_resources.h"
 #include "content/public/browser/browser_thread.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"

chrome/browser/load_library_perf_test.cc

@@ -13,7 +13,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
 

chrome/browser/media/DEPS

@@ -2,7 +2,7 @@ include_rules = [
   "+media/audio",
   "+media/base",
   "+media/cast",
-  "+media/media_features.h",
+  "+media/media_buildflags.h",
   "+media/mojo/interfaces",
   # safe_dial_device_description_parser_unittest.cc needs DataDecoderService.
   "+services/data_decoder/data_decoder_service.h",

chrome/browser/media/cdm_storage_id.cc

@@ -11,7 +11,7 @@
 #include "chrome/browser/media/media_storage_id_salt.h"
 #include "crypto/secure_hash.h"
 #include "crypto/sha2.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "rlz/features/features.h"
 #include "url/origin.h"
 

chrome/browser/media/cdm_storage_id_key.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/media/cdm_storage_id_key.h"
 
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 #if !BUILDFLAG(ENABLE_CDM_STORAGE_ID)
 #error This should only be compiled if "enable_cdm_storage_id" specified.

chrome/browser/media/encrypted_media_browsertest.cc

@@ -27,7 +27,7 @@
 #include "content/public/test/browser_test_utils.h"
 #include "media/base/key_system_names.h"
 #include "media/base/media_switches.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "testing/gtest/include/gtest/gtest-spi.h"
 
 #if defined(OS_WIN)

chrome/browser/media/encrypted_media_supported_types_browsertest.cc

@@ -26,7 +26,7 @@
 #include "content/public/test/browser_test_utils.h"
 #include "media/base/media_switches.h"
 #include "media/base/test_data_util.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "url/gurl.h"
 

chrome/browser/media/platform_verification_impl.cc

@@ -9,7 +9,7 @@
 #include "base/memory/ptr_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 #if BUILDFLAG(ENABLE_CDM_STORAGE_ID)
 #include "chrome/browser/media/cdm_storage_id.h"

chrome/browser/plugins/plugin_info_host_impl.h

@@ -23,7 +23,7 @@
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 
 class GURL;

chrome/browser/policy/configuration_policy_handler_list_factory.cc

@@ -60,7 +60,7 @@
 #include "components/translate/core/browser/translate_pref_names.h"
 #include "components/variations/pref_names.h"
 #include "extensions/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/features/features.h"
 
 #if defined(OS_ANDROID)

chrome/browser/policy/policy_browsertest.cc

@@ -184,7 +184,7 @@
 #include "extensions/common/manifest_handlers/shared_module_info.h"
 #include "extensions/common/switches.h"
 #include "extensions/common/value_builder.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "net/base/net_errors.h"
 #include "net/base/url_util.h"
 #include "net/dns/mock_host_resolver.h"

chrome/browser/renderer_host/pepper/pepper_platform_verification_message_filter.cc

@@ -10,7 +10,7 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/host_message_context.h"

chrome/browser/renderer_preferences_util.cc

@@ -16,7 +16,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/common/webrtc_ip_handling_policy.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "third_party/WebKit/public/public_features.h"
 #include "third_party/skia/include/core/SkColor.h"
 

chrome/browser/ui/browser_ui_prefs.cc

@@ -16,7 +16,7 @@
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/translate/core/browser/translate_pref_names.h"
 #include "content/public/common/webrtc_ip_handling_policy.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"

chrome/browser/ui/prefs/prefs_tab_helper.cc

@@ -45,7 +45,7 @@
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/common/web_preferences.h"
 #include "extensions/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
 #include "ui/base/l10n/l10n_util.h"

chrome/browser/ui/startup/bad_flags_prompt.cc

@@ -33,7 +33,7 @@
 #include "extensions/common/switches.h"
 #include "google_apis/gaia/gaia_switches.h"
 #include "media/base/media_switches.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "services/network/public/cpp/network_switches.h"
 #include "services/service_manager/sandbox/switches.h"
 #include "ui/base/l10n/l10n_util.h"

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -89,7 +89,7 @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_utils.h"
 #include "extensions/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/features/features.h"
 #include "printing/features/features.h"
 #include "ui/gfx/favicon_size.h"

chrome/common/BUILD.gn

@@ -572,7 +572,7 @@ static_library("constants") {
     "//components/nacl/common:switches",
     "//components/offline_pages/buildflags",
     "//device/vr/buildflags",
-    "//media:media_features",
+    "//media:media_buildflags",
     "//media/cdm:cdm_paths",  # Needed by chrome_paths.cc.
     "//ppapi/features",
     "//third_party/widevine/cdm:headers",

chrome/common/chrome_content_client.cc

@@ -50,7 +50,7 @@
 #include "gpu/config/gpu_util.h"
 #include "media/base/media_switches.h"
 #include "media/base/video_codecs.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "net/http/http_util.h"
 #include "pdf/features.h"
 #include "ppapi/features/features.h"

chrome/common/chrome_paths.cc

@@ -18,7 +18,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "media/cdm/cdm_paths.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/path_utils.h"

chrome/common/common_message_generator.h

@@ -29,7 +29,7 @@
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/common_param_traits_macros.h"
 #include "extensions/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "printing/features/features.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)

chrome/common/logging_chrome.cc

@@ -8,7 +8,7 @@
 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define
 // IPC_MESSAGE_MACROS_LOG_ENABLED so render_messages.h will generate the
 // ViewMsgLog et al. functions.
-#include "ipc/ipc_features.h"
+#include "ipc/ipc_buildflags.h"
 
 // On Windows, the about:ipc dialog shows IPCs; on POSIX, we hook up a
 // logger in this file.  (We implement about:ipc on Mac but implement

chrome/common/pref_names.cc

@@ -9,7 +9,7 @@
 #include "chrome/common/buildflags.h"
 #include "chrome/common/pref_font_webkit_names.h"
 #include "extensions/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/features/features.h"
 
 namespace prefs {

chrome/common/pref_names.h

@@ -13,7 +13,7 @@
 #include "chrome/common/buildflags.h"
 #include "components/offline_pages/buildflags/buildflags.h"
 #include "extensions/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/features/features.h"
 #include "rlz/features/features.h"
 

chrome/common/render_messages.h

@@ -24,7 +24,7 @@
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/features/features.h"
 #include "url/gurl.h"
 #include "url/ipc/url_param_traits.h"

chrome/common/webui_url_constants.h

@@ -13,7 +13,7 @@
 #include "build/build_config.h"
 #include "chrome/common/buildflags.h"
 #include "content/public/common/url_constants.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "printing/features/features.h"
 
 namespace chrome {

chrome/renderer/BUILD.gn

@@ -142,7 +142,7 @@ static_library("renderer") {
     "//content/public/renderer",
     "//extensions/buildflags",
     "//media",
-    "//media:media_features",
+    "//media:media_buildflags",
     "//media/capture",
     "//mojo/public/cpp/bindings",
     "//net",
@@ -203,7 +203,7 @@ static_library("renderer") {
     deps += [
       "//components/pdf/renderer",
       "//components/strings",
-      "//media:media_features",
+      "//media:media_buildflags",
       "//ppapi/host",
       "//ppapi/proxy",
       "//ppapi/proxy:ipc",

chrome/renderer/chrome_content_renderer_client.cc

@@ -103,7 +103,7 @@
 #include "extensions/common/constants.h"
 #include "ipc/ipc_sync_channel.h"
 #include "media/base/media_switches.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "net/base/net_errors.h"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/features/features.h"

chrome/renderer/chrome_content_renderer_client.h

@@ -26,7 +26,7 @@
 #include "content/public/renderer/render_thread.h"
 #include "extensions/buildflags/buildflags.h"
 #include "ipc/ipc_channel_proxy.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/features/features.h"
 #include "printing/features/features.h"
 #include "services/service_manager/public/cpp/binder_registry.h"

chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc

@@ -46,7 +46,7 @@
 #include "extensions/renderer/native_handler.h"
 #include "extensions/renderer/resource_bundle_source_map.h"
 #include "extensions/renderer/script_context.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"

chrome/renderer/media/chrome_key_systems.cc

@@ -20,7 +20,7 @@
 #include "content/public/renderer/render_thread.h"
 #include "media/base/eme_constants.h"
 #include "media/base/key_system_properties.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 #if defined(OS_ANDROID)
 #include "components/cdm/renderer/android_key_systems.h"

chrome/renderer/pepper/pepper_uma_host.cc

@@ -19,7 +19,7 @@
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "extensions/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/features/features.h"
 #include "ppapi/host/dispatch_host_message.h"

chrome/renderer/plugins/plugin_uma_unittest.cc

@@ -5,7 +5,7 @@
 #include <gtest/gtest.h>
 
 #include "chrome/renderer/plugins/plugin_uma.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/features/features.h"
 
 class PluginUMATest : public testing::Test {

chrome/services/media_gallery_util/media_metadata_parser.cc

@@ -13,7 +13,7 @@
 #include "base/threading/thread.h"
 #include "media/base/data_source.h"
 #include "media/filters/audio_video_metadata_extractor.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "net/base/mime_sniffer.h"
 
 namespace MediaGalleries = extensions::api::media_galleries;

chrome/services/media_gallery_util/media_parser.cc

@@ -6,7 +6,7 @@
 
 #include "chrome/services/media_gallery_util/ipc_data_source.h"
 #include "chrome/services/media_gallery_util/media_metadata_parser.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 #if BUILDFLAG(ENABLE_FFMPEG)
 #include "media/filters/media_file_checker.h"

chrome/test/BUILD.gn

@@ -156,7 +156,7 @@ static_library("test_support") {
     "//google_apis:test_support",
     "//gpu/ipc/service",
     "//ipc:test_support",
-    "//media:media_features",
+    "//media:media_buildflags",
     "//net",
     "//net:test_support",
     "//pdf",
@@ -362,7 +362,7 @@ test("browser_tests") {
     "//components/spellcheck:buildflags",
     "//components/sync:test_support_model",
     "//extensions/buildflags",
-    "//media:media_features",
+    "//media:media_buildflags",
     "//net:test_support",
     "//ppapi/features",
     "//printing/features",
@@ -5440,7 +5440,7 @@ if (!is_android && !is_fuchsia) {
     # differently if possible).
     deps = [
       "//base/test:test_support_perf",
-      "//media:media_features",
+      "//media:media_buildflags",
       "//testing/gtest",
       "//testing/perf",
       "//third_party/widevine/cdm:headers",

chrome/test/base/testing_browser_process.cc

@@ -30,7 +30,7 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/network_connection_tracker.h"
 #include "extensions/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "printing/features/features.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/test/base/testing_browser_process.h

@@ -21,7 +21,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "extensions/buildflags/buildflags.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "printing/features/features.h"
 
 class BackgroundModeManager;

chromecast/browser/cast_content_browser_client.cc

@@ -59,7 +59,7 @@
 #include "content/public/common/url_constants.h"
 #include "content/public/common/web_preferences.h"
 #include "media/audio/audio_thread_impl.h"
-#include "media/mojo/features.h"
+#include "media/mojo/buildflags.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/resource/resource_bundle.h"

chromecast/renderer/DEPS

@@ -9,7 +9,7 @@ include_rules = [
   "+extensions/common",
   "+extensions/renderer",
   "+media/base",
-  "+media/media_features.h",
+  "+media/media_buildflags.h",
   "+media/renderers",
   "+mojo/public",
   "+services/service_manager/public",

chromecast/renderer/media/key_systems_cast.cc

@@ -15,7 +15,7 @@
 #include "components/cdm/renderer/widevine_key_system_properties.h"
 #include "media/base/eme_constants.h"
 #include "media/base/key_system_properties.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 

components/cdm/DEPS

@@ -2,6 +2,6 @@ include_rules = [
   "+ipc",
   "+media/base",
   "+media/cdm",
-  "+media/media_features.h",
+  "+media/media_buildflags.h",
   "+ppapi/features",
 ]

components/cdm/browser/DEPS

@@ -2,7 +2,7 @@ include_rules = [
   "+components/prefs",
   "+content/public/browser",
   "+media/cdm",
-  "+media/media_features.h",
+  "+media/media_buildflags.h",
   "+media/mojo",
   "+mojo/public/cpp/bindings",
 

components/cdm/browser/cdm_message_filter_android.cc

@@ -20,7 +20,7 @@
 #include "media/base/audio_codecs.h"
 #include "media/base/media_switches.h"
 #include "media/base/video_codecs.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 using media::MediaDrmBridge;
 using media::SupportedCodecs;

components/cdm/common/widevine_drm_delegate_android.cc

@@ -6,7 +6,7 @@
 
 #include "base/macros.h"
 #include "media/cdm/cenc_utils.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 namespace cdm {
 

components/cdm/renderer/BUILD.gn

@@ -22,7 +22,7 @@ static_library("renderer") {
     "//components/cdm/common",
     "//content/public/renderer",
     "//media",
-    "//media:media_features",
+    "//media:media_buildflags",
     "//third_party/widevine/cdm:headers",
   ]
 }

components/cdm/renderer/android_key_systems.cc

@@ -13,7 +13,7 @@
 #include "content/public/renderer/render_thread.h"
 #include "media/base/eme_constants.h"
 #include "media/base/media_switches.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 

components/cdm/renderer/external_clear_key_key_system_properties.cc

@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "media/base/eme_constants.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 namespace cdm {
 

components/cdm/renderer/external_clear_key_key_system_properties.h

@@ -9,7 +9,7 @@
 
 #include "build/build_config.h"
 #include "media/base/key_system_properties.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 namespace cdm {
 

components/cdm/renderer/widevine_key_system_properties.cc

@@ -4,7 +4,7 @@
 
 #include "components/cdm/renderer/widevine_key_system_properties.h"
 
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(WIDEVINE_CDM_AVAILABLE)

components/cdm/renderer/widevine_key_system_properties.h

@@ -7,7 +7,7 @@
 
 #include "build/build_config.h"
 #include "media/base/key_system_properties.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 
 namespace cdm {
 

components/nacl/common/BUILD.gn

@@ -57,7 +57,7 @@ if (enable_nacl) {
 
     # Deps required by the above headers.
     deps = [
-      "//media:media_features",
+      "//media:media_buildflags",
     ]
   }
 

components/nacl/loader/BUILD.gn

@@ -59,7 +59,7 @@ source_set("minimal_content_dummy") {
 
   # Deps required by the above headers.
   deps = [
-    "//media:media_features",
+    "//media:media_buildflags",
   ]
 }
 

components/pdf/DEPS

@@ -1,5 +1,6 @@
 include_rules = [
   "+content/public/common",
+  "+content/public/test",
   "+ipc",
   "+ui/gfx",
 ]

components/viz/common/BUILD.gn

@@ -168,7 +168,7 @@ viz_component("common") {
     "//gpu/command_buffer/service",
     "//gpu/ipc:gl_in_process_context",
     "//gpu/skia_bindings:skia_bindings",
-    "//gpu/vulkan:features",
+    "//gpu/vulkan:buildflags",
     "//mojo/public/cpp/bindings",
     "//skia",
     "//third_party/libyuv",

components/viz/common/gpu/vulkan_in_process_context_provider.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "components/viz/common/gpu/vulkan_in_process_context_provider.h"
-#include "gpu/vulkan/features.h"
+#include "gpu/vulkan/buildflags.h"
 
 #if BUILDFLAG(ENABLE_VULKAN)
 #include "gpu/vulkan/vulkan_device_queue.h"

components/viz/common/gpu/vulkan_in_process_context_provider.h

@@ -9,7 +9,7 @@
 
 #include "components/viz/common/gpu/vulkan_context_provider.h"
 #include "components/viz/common/viz_common_export.h"
-#include "gpu/vulkan/features.h"
+#include "gpu/vulkan/buildflags.h"
 #if BUILDFLAG(ENABLE_VULKAN)
 #include "third_party/skia/include/gpu/vk/GrVkBackendContext.h"
 #endif

components/viz/service/BUILD.gn

@@ -172,7 +172,7 @@ viz_component("service") {
     # dependency should not be in public_deps.
     "//gpu/ipc/client",
     "//gpu/ipc/service",
-    "//gpu/vulkan:features",
+    "//gpu/vulkan:buildflags",
     "//media",
     "//media/capture:capture_lib",
     "//media/gpu/ipc/service",

components/viz/service/display/display.cc

@@ -28,7 +28,7 @@
 #include "components/viz/service/surfaces/surface.h"
 #include "components/viz/service/surfaces/surface_manager.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
-#include "gpu/vulkan/features.h"
+#include "gpu/vulkan/buildflags.h"
 #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
 #include "ui/gfx/buffer_types.h"
 #include "ui/gfx/geometry/rect_conversions.h"

components/viz/service/display/output_surface.h

@@ -18,7 +18,7 @@
 #include "components/viz/service/display/software_output_device.h"
 #include "components/viz/service/viz_service_export.h"
 #include "gpu/command_buffer/common/texture_in_use_response.h"
-#include "gpu/vulkan/features.h"
+#include "gpu/vulkan/buildflags.h"
 #include "gpu/vulkan/vulkan_surface.h"
 #include "ui/gfx/color_space.h"
 #include "ui/latency/latency_info.h"

components/viz/service/display/skia_renderer.h

@@ -10,7 +10,7 @@
 #include "components/viz/service/display/direct_renderer.h"
 #include "components/viz/service/display/sync_query_collection.h"
 #include "components/viz/service/viz_service_export.h"
-#include "gpu/vulkan/features.h"
+#include "gpu/vulkan/buildflags.h"
 #include "ui/latency/latency_info.h"
 
 class SkNWayCanvas;

components/viz/service/main/viz_main_impl.cc

@@ -24,7 +24,7 @@
 #include "gpu/ipc/gpu_in_process_thread_service.h"
 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "gpu/ipc/service/gpu_watchdog_thread.h"
-#include "media/gpu/features.h"
+#include "media/gpu/buildflags.h"
 #include "services/metrics/public/cpp/delegating_ukm_recorder.h"
 #include "services/metrics/public/cpp/mojo_ukm_recorder.h"
 #include "services/metrics/public/mojom/constants.mojom.h"

content/BUILD.gn

@@ -100,7 +100,7 @@ if (is_component_build) {
     set_sources_assignment_filter(sources_assignment_filter)
     deps = [
       "//base",
-      "//media:media_features",
+      "//media:media_buildflags",
       "//sandbox:sandbox_features",
       "//sandbox/linux:sandbox",
       "//services/service_manager/sandbox",

content/app/content_main_runner.cc

@@ -55,7 +55,7 @@
 #include "content/public/common/zygote_buildflags.h"
 #include "gin/v8_initializer.h"
 #include "media/base/media.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/features/features.h"
 #include "services/service_manager/embedder/switches.h"
 #include "services/service_manager/sandbox/sandbox_type.h"

content/browser/BUILD.gn

@@ -96,13 +96,13 @@ jumbo_source_set("browser") {
     "//gpu/command_buffer/client:raster_interface",
     "//gpu/ipc/common:gpu_preferences_util",
     "//gpu/ipc/host",
-    "//gpu/vulkan:features",
+    "//gpu/vulkan:buildflags",
     "//media",
-    "//media:media_features",
+    "//media:media_buildflags",
     "//media/capture",
     "//media/midi",
     "//media/midi:mojo",
-    "//media/mojo:features",
+    "//media/mojo:buildflags",
     "//media/mojo/clients:jpeg_decode_accelerator",
     "//media/mojo/interfaces",
     "//media/mojo/interfaces:constants",

content/browser/browser_main_loop.cc

@@ -107,15 +107,15 @@
 #include "content/public/common/service_names.mojom.h"
 #include "content/public/common/zygote_buildflags.h"
 #include "device/gamepad/gamepad_service.h"
-#include "gpu/vulkan/features.h"
+#include "gpu/vulkan/buildflags.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_system.h"
 #include "media/audio/audio_thread_impl.h"
 #include "media/base/media.h"
 #include "media/base/user_input_monitor.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "media/midi/midi_service.h"
-#include "media/mojo/features.h"
+#include "media/mojo/buildflags.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/scoped_ipc_support.h"
 #include "net/base/network_change_notifier.h"

content/browser/browser_main_loop.h

@@ -14,7 +14,7 @@
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_main_runner.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/viz/public/interfaces/compositing/compositing_mode_watcher.mojom.h"
 #include "ui/base/ui_features.h"

content/browser/compositor/gpu_browser_compositor_output_surface.h

@@ -11,7 +11,7 @@
 #include "build/build_config.h"
 #include "content/browser/compositor/browser_compositor_output_surface.h"
 #include "content/browser/compositor/gpu_vsync_begin_frame_source.h"
-#include "gpu/vulkan/features.h"
+#include "gpu/vulkan/buildflags.h"
 #include "ui/gfx/swap_result.h"
 
 namespace viz {

content/browser/compositor/gpu_process_transport_factory.cc

@@ -61,7 +61,7 @@
 #include "gpu/config/gpu_feature_info.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "gpu/ipc/host/gpu_memory_buffer_support.h"
-#include "gpu/vulkan/features.h"
+#include "gpu/vulkan/buildflags.h"
 #include "services/service_manager/runner/common/client_util.h"
 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
 #include "third_party/khronos/GLES2/gl2.h"

content/browser/compositor/offscreen_browser_compositor_output_surface.h

@@ -14,7 +14,7 @@
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "content/browser/compositor/browser_compositor_output_surface.h"
-#include "gpu/vulkan/features.h"
+#include "gpu/vulkan/buildflags.h"
 #include "ui/latency/latency_info.h"
 
 namespace ui {

content/browser/compositor/software_browser_compositor_output_surface.h

@@ -11,7 +11,7 @@
 #include "build/build_config.h"
 #include "content/browser/compositor/browser_compositor_output_surface.h"
 #include "content/common/content_export.h"
-#include "gpu/vulkan/features.h"
+#include "gpu/vulkan/buildflags.h"
 
 namespace cc {
 class SoftwareOutputDevice;

content/browser/frame_host/render_frame_host_impl.cc

@@ -131,7 +131,7 @@
 #include "media/audio/audio_manager.h"
 #include "media/base/media_switches.h"
 #include "media/base/user_input_monitor.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "media/mojo/interfaces/remoting.mojom.h"
 #include "media/mojo/services/media_interface_provider.h"
 #include "media/mojo/services/media_metrics_provider.h"

content/browser/gpu/compositor_util.cc

@@ -28,7 +28,7 @@
 #include "gpu/config/gpu_finch_features.h"
 #include "gpu/config/gpu_switches.h"
 #include "gpu/ipc/host/gpu_memory_buffer_support.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ui/gl/gl_switches.h"
 
 namespace content {

content/browser/gpu/gpu_data_manager_impl_private.cc

@@ -46,7 +46,7 @@
 #include "gpu/ipc/common/gpu_preferences_util.h"
 #include "gpu/ipc/common/memory_stats.h"
 #include "gpu/ipc/host/shader_disk_cache.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/switches.h"
 #include "ui/gl/gl_features.h"

content/browser/gpu/gpu_process_host.cc

@@ -63,7 +63,7 @@
 #include "gpu/config/gpu_driver_bug_workaround_type.h"
 #include "gpu/ipc/host/shader_disk_cache.h"
 #include "media/base/media_switches.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/connector.h"

content/browser/media/encrypted_media_browsertest.cc

@@ -14,8 +14,8 @@
 #include "media/base/media.h"
 #include "media/base/media_switches.h"
 #include "media/base/test_data_util.h"
-#include "media/media_features.h"
-#include "media/mojo/features.h"
+#include "media/media_buildflags.h"
+#include "media/mojo/buildflags.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"

content/browser/media/media_browsertest.cc

@@ -15,7 +15,7 @@
 #include "content/shell/browser/shell.h"
 #include "media/base/media_switches.h"
 #include "media/base/test_data_util.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "url/url_util.h"
 

content/browser/media/media_canplaytype_browsertest.cc

@@ -14,7 +14,7 @@
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "media/base/media_switches.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "third_party/libaom/av1_features.h"
 #include "ui/display/display_switches.h"