Rename buildflag_headers for consistency

This updates ui/base/ui_features

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

BUG=814485
TEST=covered by build

Change-Id: Ia06811589cbaf18daab4c67048096875fb25cf3e
Reviewed-on: https://chromium-review.googlesource.com/c/1403088
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#621329}

diff --git a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
index 3c87139d..9eac88f 100644
--- a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc

@@ -48,11 +48,11 @@
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/ime_text_span.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/test/ui_controls.h"
-#include "ui/base/ui_features.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/range/range.h"

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 5ff2ecd..ade9294 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -316,10 +316,10 @@
 #include "third_party/blink/public/platform/modules/installedapp/installed_app_provider.mojom.h"
 #include "third_party/blink/public/platform/modules/webshare/webshare.mojom.h"
 #include "third_party/widevine/cdm/buildflags.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_features.h"
-#include "ui/base/ui_features.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "url/gurl.h"
 #include "url/origin.h"

diff --git a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
index b29bf41..e390712 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc

@@ -32,7 +32,7 @@
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 
 #if defined(OS_WIN)
 #include "ui/views/win/hwnd_util.h"

diff --git a/chrome/browser/extensions/dev_mode_bubble_delegate.cc b/chrome/browser/extensions/dev_mode_bubble_delegate.cc
index 2cb5204..4ef5b21 100644
--- a/chrome/browser/extensions/dev_mode_bubble_delegate.cc
+++ b/chrome/browser/extensions/dev_mode_bubble_delegate.cc

@@ -16,8 +16,8 @@
 #include "components/strings/grit/components_strings.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/ui_features.h"
 
 namespace extensions {
 

diff --git a/chrome/browser/global_keyboard_shortcuts_mac_unittest.mm b/chrome/browser/global_keyboard_shortcuts_mac_unittest.mm
index df9f519..f684271 100644
--- a/chrome/browser/global_keyboard_shortcuts_mac_unittest.mm
+++ b/chrome/browser/global_keyboard_shortcuts_mac_unittest.mm

@@ -12,7 +12,7 @@
 #include "base/stl_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "ui/events/keycodes/keyboard_code_conversion_mac.h"
 
 namespace {

diff --git a/chrome/browser/media/router/BUILD.gn b/chrome/browser/media/router/BUILD.gn
index 8e50856c..0eb17770 100644
--- a/chrome/browser/media/router/BUILD.gn
+++ b/chrome/browser/media/router/BUILD.gn

@@ -66,7 +66,7 @@
       "discovery",
       "//extensions/browser",
       "//mojo/public/cpp/bindings",
-      "//ui/base:ui_features",
+      "//ui/base:buildflags",
     ]
     sources += [
       "data_decoder_util.cc",

diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
index 44a47b6..c1591e7 100644
--- a/chrome/browser/media/router/media_router_feature.cc
+++ b/chrome/browser/media/router/media_router_feature.cc

@@ -15,7 +15,7 @@
 #include "crypto/random.h"
 #include "extensions/buildflags/buildflags.h"
 #include "services/network/public/cpp/features.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 
 #if defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/common/chrome_features.h"

diff --git a/chrome/browser/notifications/notification_display_service_tester.cc b/chrome/browser/notifications/notification_display_service_tester.cc
index 10f728b..b23374bd 100644
--- a/chrome/browser/notifications/notification_display_service_tester.cc
+++ b/chrome/browser/notifications/notification_display_service_tester.cc

@@ -17,7 +17,7 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "ui/message_center/public/cpp/notification.h"
 
 namespace {

diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.h b/chrome/browser/safe_browsing/chrome_password_protection_service.h
index c8c1264..e3892a7 100644
--- a/chrome/browser/safe_browsing/chrome_password_protection_service.h
+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h

@@ -13,7 +13,7 @@
 #include "components/safe_browsing/triggers/trigger_manager.h"
 #include "components/sessions/core/session_id.h"
 #include "components/sync/protocol/user_event_specifics.pb.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "url/origin.h"
 
 struct AccountInfo;

diff --git a/chrome/browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc b/chrome/browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc
index 87ea546..e8707ac 100644
--- a/chrome/browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc
+++ b/chrome/browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc

@@ -15,7 +15,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/dns/mock_host_resolver.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 
 class HungRendererNavigationTest : public InProcessBrowserTest {
  public:

diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 63914ac..f1ef3d3 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc

@@ -62,7 +62,7 @@
 #include "content/public/common/content_switches.h"
 #include "google_apis/google_api_keys.h"
 #include "rlz/buildflags/buildflags.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"

diff --git a/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc b/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc
index 1841590..7fc8a548 100644
--- a/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc
+++ b/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc

@@ -15,8 +15,8 @@
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/accessibility/platform/ax_platform_node.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/ui_features.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/border.h"

diff --git a/chrome/browser/ui/views/confirm_bubble_views.cc b/chrome/browser/ui/views/confirm_bubble_views.cc
index 873121af..e1187da 100644
--- a/chrome/browser/ui/views/confirm_bubble_views.cc
+++ b/chrome/browser/ui/views/confirm_bubble_views.cc

@@ -13,8 +13,8 @@
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/vector_icons/vector_icons.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/ui_features.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/image_button_factory.h"
 #include "ui/views/controls/label.h"

diff --git a/chrome/browser/ui/views/download/download_danger_prompt_views.cc b/chrome/browser/ui/views/download/download_danger_prompt_views.cc
index e4ac61d..702efdc 100644
--- a/chrome/browser/ui/views/download/download_danger_prompt_views.cc
+++ b/chrome/browser/ui/views/download/download_danger_prompt_views.cc

@@ -17,9 +17,9 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item_utils.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_features.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/window/dialog_client_view.h"

diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc
index 8f58e665..f1bb541 100644
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc

@@ -38,8 +38,8 @@
 #include "components/signin/core/browser/account_info.h"
 #include "components/signin/core/browser/signin_buildflags.h"
 #include "extensions/common/extension.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/ui_features.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/views/bubble/bubble_dialog_delegate_view.h"

diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc
index fe0ad4a..07ebd10 100644
--- a/chrome/browser/ui/views/global_error_bubble_view.cc
+++ b/chrome/browser/ui/views/global_error_bubble_view.cc

@@ -23,8 +23,8 @@
 #include "chrome/browser/ui/views/frame/app_menu_button.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_features.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/label_button.h"

diff --git a/chrome/browser/ui/views/hats/hats_bubble_view.cc b/chrome/browser/ui/views/hats/hats_bubble_view.cc
index c24ad710..d0e00a8 100644
--- a/chrome/browser/ui/views/hats/hats_bubble_view.cc
+++ b/chrome/browser/ui/views/hats/hats_bubble_view.cc

@@ -12,7 +12,7 @@
 #include "chrome/browser/ui/views/frame/app_menu_button.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"

diff --git a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc
index 5fb2500..287d11e5 100644
--- a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc
+++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc

@@ -17,8 +17,8 @@
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/ui_features.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"

diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view_base.cc b/chrome/browser/ui/views/page_info/page_info_bubble_view_base.cc
index 6943e78b..a197fad 100644
--- a/chrome/browser/ui/views/page_info/page_info_bubble_view_base.cc
+++ b/chrome/browser/ui/views/page_info/page_info_bubble_view_base.cc

@@ -8,7 +8,7 @@
 #include "chrome/browser/ui/page_info/page_info_dialog.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 

diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.cc
index 32e36f1..6a009ddd 100644
--- a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.cc
+++ b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.cc

@@ -20,8 +20,8 @@
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/vector_icons/vector_icons.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/ui_features.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/paint_vector_icon.h"

diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc
index 7a6b8d4..1342197 100644
--- a/chrome/browser/ui/views/session_crashed_bubble_view.cc
+++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc

@@ -36,8 +36,8 @@
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/ui_features.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"

diff --git a/chrome/browser/ui/views/session_crashed_bubble_view_browsertest.cc b/chrome/browser/ui/views/session_crashed_bubble_view_browsertest.cc
index 2c9a6c5..c1ff93b2 100644
--- a/chrome/browser/ui/views/session_crashed_bubble_view_browsertest.cc
+++ b/chrome/browser/ui/views/session_crashed_bubble_view_browsertest.cc

@@ -13,7 +13,7 @@
 #include "chrome/browser/ui/views/toolbar/browser_app_menu_button.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "ui/views/view.h"
 
 class SessionCrashedBubbleViewTest : public DialogBrowserTest {

diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_mac.mm b/chrome/browser/ui/views/ssl_client_certificate_selector_mac.mm
index a95fa6d2..88179a7a 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector_mac.mm
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector_mac.mm

@@ -31,8 +31,8 @@
 #include "net/cert/x509_util_mac.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_platform_key_mac.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/l10n/l10n_util_mac.h"
-#include "ui/base/ui_features.h"
 #include "ui/views/widget/widget_observer.h"
 
 @interface SFChooseIdentityPanel (SystemPrivate)

diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 88283b7..c679d6b 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn

@@ -546,7 +546,7 @@
 
   public_deps = [
     "//printing/buildflags",
-    "//ui/base:ui_features",
+    "//ui/base:buildflags",
   ]
 }
 
@@ -572,7 +572,7 @@
   ]
 
   public_deps = [
-    "//ui/base:ui_features",
+    "//ui/base:buildflags",
   ]
 }
 

diff --git a/chrome/common/chrome_features.h b/chrome/common/chrome_features.h
index 323b99a..a66e04e 100644
--- a/chrome/common/chrome_features.h
+++ b/chrome/common/chrome_features.h

@@ -17,7 +17,7 @@
 #include "extensions/buildflags/buildflags.h"
 #include "ppapi/buildflags/buildflags.h"
 #include "printing/buildflags/buildflags.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 
 namespace features {
 

diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index d4a3ac06..4c1ffeaf 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h

@@ -12,7 +12,7 @@
 #include "chrome/common/buildflags.h"
 #include "ppapi/buildflags/buildflags.h"
 #include "printing/buildflags/buildflags.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 
 // Don't add more switch files here. This is linked into some places like the
 // installer where dependencies should be limited. Instead, have files

diff --git a/chrome/test/base/interactive_test_utils_views.cc b/chrome/test/base/interactive_test_utils_views.cc
index 46cbac5..3f04aa0 100644
--- a/chrome/test/base/interactive_test_utils_views.cc
+++ b/chrome/test/base/interactive_test_utils_views.cc

@@ -9,7 +9,7 @@
 #include "build/buildflag.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "ui/views/focus/focus_manager.h"
 
 namespace ui_test_utils {

diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
index 27e7428..69408e0 100644
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn

@@ -54,7 +54,7 @@
     "//sql",
     "//third_party/libxml",
     "//third_party/zlib/google:zip",
-    "//ui/base:ui_features",
+    "//ui/base:buildflags",
   ]
 
   if (!is_android) {

diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
index 2763278..0004ff1 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc

@@ -32,7 +32,7 @@
 #include "services/network/public/cpp/features.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/sandbox/switches.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/utility/importer/profile_import_impl.h"

diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
index 7109f51..fe3da63 100644
--- a/components/exo/wayland/server.cc
+++ b/components/exo/wayland/server.cc

@@ -80,9 +80,9 @@
 #include "components/exo/wm_helper.h"
 #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
 #include "third_party/skia/include/core/SkRegion.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/class_property.h"
 #include "ui/base/hit_test.h"
-#include "ui/base/ui_features.h"
 #include "ui/compositor/compositor_vsync_manager.h"
 #include "ui/display/display_switches.h"
 #include "ui/display/manager/display_util.h"

diff --git a/components/exo/wayland/wayland_keyboard_delegate.h b/components/exo/wayland/wayland_keyboard_delegate.h
index 5ca3084..de5d7e78 100644
--- a/components/exo/wayland/wayland_keyboard_delegate.h
+++ b/components/exo/wayland/wayland_keyboard_delegate.h

@@ -12,7 +12,7 @@
 #include "components/exo/keyboard_observer.h"
 #include "components/exo/wayland/server_util.h"
 #include "components/exo/wayland/wayland_input_delegate.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 
 #if defined(OS_CHROMEOS)

diff --git a/components/test/components_test_suite.cc b/components/test/components_test_suite.cc
index 5bedab8..6db41e1 100644
--- a/components/test/components_test_suite.cc
+++ b/components/test/components_test_suite.cc

@@ -18,9 +18,9 @@
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "mojo/core/embedder/embedder.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
-#include "ui/base/ui_features.h"
 #include "url/url_util.h"
 
 #if defined(OS_IOS)

diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 0d6f725..c130c494 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn

@@ -197,7 +197,7 @@
     "//ui/accessibility",
     "//ui/accessibility:ax_enums_mojo",
     "//ui/base",
-    "//ui/base:ui_features",
+    "//ui/base:buildflags",
     "//ui/base/ime",
     "//ui/display",
     "//ui/display/types",

diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 0d67235..9390c615 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h

@@ -19,7 +19,7 @@
 #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"
+#include "ui/base/buildflags.h"
 
 #if defined(OS_CHROMEOS)
 #include "content/browser/media/keyboard_mic_registration.h"

diff --git a/content/browser/service_manager/service_manager_context.cc b/content/browser/service_manager/service_manager_context.cc
index 5d5630c..ca73f17 100644
--- a/content/browser/service_manager/service_manager_context.cc
+++ b/content/browser/service_manager/service_manager_context.cc

@@ -86,8 +86,8 @@
 #include "services/video_capture/public/mojom/constants.mojom.h"
 #include "services/video_capture/service_impl.h"
 #include "services/viz/public/interfaces/constants.mojom.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/ui_base_features.h"
-#include "ui/base/ui_features.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"

diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index ceb3838e..59a07b2 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc

@@ -53,9 +53,9 @@
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ws/public/mojom/constants.mojom.h"
 #include "third_party/blink/public/web/blink.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/base/ui_features.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"

diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc
index 0c09bbf..08264b3 100644
--- a/content/public/test/test_launcher.cc
+++ b/content/public/test/test_launcher.cc

@@ -41,8 +41,8 @@
 #include "gpu/config/gpu_switches.h"
 #include "net/base/escape.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/ui_base_features.h"
-#include "ui/base/ui_features.h"
 
 #if defined(OS_POSIX)
 #include "base/files/file_descriptor_watcher_posix.h"

diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 8e2b608..839ef8f1 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc

@@ -22,8 +22,8 @@
 #include "content/shell/common/shell_switches.h"
 #include "media/base/media_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/base/ui_features.h"
 
 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
 #include "gin/v8_initializer.h"

diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc
index 9b4a7ea..9df8a5e 100644
--- a/extensions/test/extensions_unittests_main.cc
+++ b/extensions/test/extensions_unittests_main.cc

@@ -17,8 +17,8 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/test/test_extensions_client.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_features.h"
 #include "ui/gl/test/gl_surface_test_support.h"
 #include "url/url_util.h"
 

diff --git a/ui/accessibility/platform/ax_platform_node.cc b/ui/accessibility/platform/ax_platform_node.cc
index 9378108..ec4f6fac 100644
--- a/ui/accessibility/platform/ax_platform_node.cc
+++ b/ui/accessibility/platform/ax_platform_node.cc

@@ -8,7 +8,7 @@
 #include "build/build_config.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/platform/ax_platform_node_delegate.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 
 namespace ui {
 

diff --git a/ui/accessibility/platform/ax_platform_node_base.h b/ui/accessibility/platform/ax_platform_node_base.h
index be97da3..6f11108 100644
--- a/ui/accessibility/platform/ax_platform_node_base.h
+++ b/ui/accessibility/platform/ax_platform_node_base.h

@@ -13,7 +13,7 @@
 #include "build/build_config.h"
 #include "ui/accessibility/ax_enums.mojom.h"
 #include "ui/accessibility/platform/ax_platform_node.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 

diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn
index 131a694..b9d88cf 100644
--- a/ui/aura/BUILD.gn
+++ b/ui/aura/BUILD.gn

@@ -299,8 +299,8 @@
     ":aura",
     "//services/ws/common",
 
-    # Must be public as headers include ui_features.h.
-    "//ui/base:ui_features",
+    # Must be public as headers include buildflags.h.
+    "//ui/base:buildflags",
   ]
   deps = [
     "//base/test:test_support",

diff --git a/ui/aura/test/aura_test_suite_setup.h b/ui/aura/test/aura_test_suite_setup.h
index 65253e69..02f8187 100644
--- a/ui/aura/test/aura_test_suite_setup.h
+++ b/ui/aura/test/aura_test_suite_setup.h

@@ -10,7 +10,7 @@
 #include "base/macros.h"
 #include "base/test/scoped_feature_list.h"
 #include "build/buildflag.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 
 namespace ui {
 class ContextFactory;

diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 25851097..bca0714 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn

@@ -50,8 +50,8 @@
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 }
 
-buildflag_header("ui_features") {
-  header = "ui_features.h"
+buildflag_header("buildflags") {
+  header = "buildflags.h"
   flags = [
     "ENABLE_HIDPI=$enable_hidpi",
     "ENABLE_MESSAGE_CENTER=$enable_message_center",
@@ -405,8 +405,8 @@
   defines = [ "UI_BASE_IMPLEMENTATION" ]
 
   public_deps = [
+    ":buildflags",
     ":ui_data_pack",
-    ":ui_features",
     "//base",
     "//skia",
     "//ui/gfx",

diff --git a/ui/base/material_design/material_design_controller.cc b/ui/base/material_design/material_design_controller.cc
index da5ffa6..bf0caa6 100644
--- a/ui/base/material_design/material_design_controller.cc
+++ b/ui/base/material_design/material_design_controller.cc

@@ -15,10 +15,10 @@
 #include "base/observer_list.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/buildflag.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/material_design/material_design_controller_observer.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/base/ui_features.h"
 #include "ui/gfx/animation/linear_animation.h"
 
 #if defined(OS_WIN)

diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index ffbb5fa..4f4b360 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc

@@ -27,12 +27,12 @@
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/data_pack.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/base/ui_features.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/codec/jpeg_codec.h"

diff --git a/ui/base/ui_base_features.h b/ui/base/ui_base_features.h
index f78fd18..5bf2fed 100644
--- a/ui/base/ui_base_features.h
+++ b/ui/base/ui_base_features.h

@@ -7,8 +7,8 @@
 
 #include "base/feature_list.h"
 #include "build/build_config.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/ui_base_export.h"
-#include "ui/base/ui_features.h"
 
 namespace features {
 

diff --git a/ui/events/keycodes/BUILD.gn b/ui/events/keycodes/BUILD.gn
index e0705f2..1e6d31c 100644
--- a/ui/events/keycodes/BUILD.gn
+++ b/ui/events/keycodes/BUILD.gn

@@ -16,7 +16,7 @@
 
   deps = [
     "//base",
-    "//ui/base:ui_features",
+    "//ui/base:buildflags",
     "//ui/events:dom_keycode_converter",
   ]
 }

diff --git a/ui/events/keycodes/DEPS b/ui/events/keycodes/DEPS
index 162a9d7..200ea4af 100644
--- a/ui/events/keycodes/DEPS
+++ b/ui/events/keycodes/DEPS

@@ -7,7 +7,7 @@
   "-third_party",
   "-ui",
 
-  "+ui/base/ui_features.h",  # Features header doesn't bring in all of UI.
+  "+ui/base/buildflags.h",  # Doesn't bring in all of UI.
   "+ui/gfx/x/x11.h",         # Wrapper on <X11/*>.
   "+ui/gfx/x/x11_types.h",   # <X11/*> replacement.
   "+ui/events",

diff --git a/ui/events/keycodes/xkb_keysym.h b/ui/events/keycodes/xkb_keysym.h
index e2cbf6a..88e83c5e 100644
--- a/ui/events/keycodes/xkb_keysym.h
+++ b/ui/events/keycodes/xkb_keysym.h

@@ -5,7 +5,7 @@
 #ifndef UI_EVENTS_KEYCODES_XKB_KEYSYM_H_
 #define UI_EVENTS_KEYCODES_XKB_KEYSYM_H_
 
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 
 // This file provides definitions of the xkbcommon keysym type (xkb_keysym_t)
 // and values (XKB_KEY_...) for both xkbcommon and traditional X11.

diff --git a/ui/ozone/platform/drm/DEPS b/ui/ozone/platform/drm/DEPS
index 078fa01..1a3b330 100644
--- a/ui/ozone/platform/drm/DEPS
+++ b/ui/ozone/platform/drm/DEPS

@@ -2,8 +2,8 @@
   "+mojo/public",
   "+services/service_manager",
   "+services/ws",
+  "+ui/base/buildflags.h",  # Doesn't bring in all of ui/base.
   "+ui/base/ui_base_features.h",
   "+ui/base/ui_base_switches.h",
-  "+ui/base/ui_features.h",  # UI features doesn't bring in all of ui/base.
   "+ui/display/util",
 ]

diff --git a/ui/ozone/platform/drm/ozone_platform_gbm.cc b/ui/ozone/platform/drm/ozone_platform_gbm.cc
index a2e555d..e0e2c30 100644
--- a/ui/ozone/platform/drm/ozone_platform_gbm.cc
+++ b/ui/ozone/platform/drm/ozone_platform_gbm.cc

@@ -18,8 +18,8 @@
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
-#include "ui/base/ui_features.h"
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"

diff --git a/ui/ozone/platform/wayland/BUILD.gn b/ui/ozone/platform/wayland/BUILD.gn
index d3d30fc8..efd9431 100644
--- a/ui/ozone/platform/wayland/BUILD.gn
+++ b/ui/ozone/platform/wayland/BUILD.gn

@@ -98,7 +98,7 @@
     "//third_party/wayland-protocols:text_input_protocol",
     "//third_party/wayland-protocols:xdg_shell_protocol",
     "//ui/base",
-    "//ui/base:ui_features",
+    "//ui/base:buildflags",
     "//ui/base/ime/linux",
     "//ui/display/manager",
     "//ui/events",
@@ -173,7 +173,7 @@
     "//third_party/wayland:wayland_server",
     "//third_party/wayland-protocols:xdg_shell_protocol",
     "//ui/base",
-    "//ui/base:ui_features",
+    "//ui/base:buildflags",
     "//ui/base/ime/linux",
     "//ui/events/ozone:events_ozone_layout",
     "//ui/ozone:platform",

diff --git a/ui/ozone/platform/wayland/DEPS b/ui/ozone/platform/wayland/DEPS
index 56a383a0..1bdd1df 100644
--- a/ui/ozone/platform/wayland/DEPS
+++ b/ui/ozone/platform/wayland/DEPS

@@ -1,6 +1,6 @@
 include_rules = [
+  "+ui/base/buildflags.h",  # Doesn't bring in all of ui/base.
   "+ui/base/hit_test.h", # UI hit test doesn't bring in all of ui/base.
-  "+ui/base/ui_features.h",  # UI features doesn't bring in all of ui/base.
   "+ui/base/ui_base_features.h",
   "+ui/base/ime/composition_text.h",
   "+ui/base/ime/linux/linux_input_method_context.h",

diff --git a/ui/ozone/platform/wayland/ozone_platform_wayland.cc b/ui/ozone/platform/wayland/ozone_platform_wayland.cc
index a8aa259..60543d4 100644
--- a/ui/ozone/platform/wayland/ozone_platform_wayland.cc
+++ b/ui/ozone/platform/wayland/ozone_platform_wayland.cc

@@ -5,8 +5,8 @@
 #include "ui/ozone/platform/wayland/ozone_platform_wayland.h"
 
 #include "base/memory/ptr_util.h"
+#include "ui/base/buildflags.h"
 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
-#include "ui/base/ui_features.h"
 #include "ui/display/manager/fake_display_delegate.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
 #include "ui/events/system_input_injector.h"

diff --git a/ui/ozone/platform/wayland/wayland_keyboard.cc b/ui/ozone/platform/wayland/wayland_keyboard.cc
index b656859..a6d0ea7 100644
--- a/ui/ozone/platform/wayland/wayland_keyboard.cc
+++ b/ui/ozone/platform/wayland/wayland_keyboard.cc

@@ -7,7 +7,7 @@
 #include <sys/mman.h>
 
 #include "base/files/scoped_file.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/dom/dom_code.h"

diff --git a/ui/ozone/platform/wayland/wayland_test.h b/ui/ozone/platform/wayland/wayland_test.h
index 26f44a5..7c21090 100644
--- a/ui/ozone/platform/wayland/wayland_test.h
+++ b/ui/ozone/platform/wayland/wayland_test.h

@@ -7,7 +7,7 @@
 
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "ui/ozone/platform/wayland/fake_server.h"
 #include "ui/ozone/platform/wayland/gpu/wayland_connection_proxy.h"
 #include "ui/ozone/platform/wayland/wayland_connection.h"

diff --git a/ui/ozone/platform/wayland/wayland_touch.cc b/ui/ozone/platform/wayland/wayland_touch.cc
index 9052eaf..d30bc73 100644
--- a/ui/ozone/platform/wayland/wayland_touch.cc
+++ b/ui/ozone/platform/wayland/wayland_touch.cc

@@ -8,7 +8,7 @@
 #include <wayland-client.h>
 
 #include "base/files/scoped_file.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "ui/events/event.h"
 #include "ui/ozone/platform/wayland/wayland_connection.h"
 #include "ui/ozone/platform/wayland/wayland_window.h"

diff --git a/ui/views/accessibility/view_accessibility.cc b/ui/views/accessibility/view_accessibility.cc
index 87719af..7a119bef 100644
--- a/ui/views/accessibility/view_accessibility.cc
+++ b/ui/views/accessibility/view_accessibility.cc

@@ -10,7 +10,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/platform/ax_platform_node.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 

diff --git a/ui/views/style/platform_style_mac.mm b/ui/views/style/platform_style_mac.mm
index 323f6ff..76fb02ac 100644
--- a/ui/views/style/platform_style_mac.mm
+++ b/ui/views/style/platform_style_mac.mm

@@ -5,7 +5,7 @@
 #include "ui/views/style/platform_style.h"
 
 #include "base/strings/sys_string_conversions.h"
-#include "ui/base/ui_features.h"
+#include "ui/base/buildflags.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/controls/button/label_button.h"
 #import "ui/views/controls/scrollbar/cocoa_scroll_bar.h"