Remove chromeos_buildflags.h from //base headers

Stop using //base as a crutch for other parts of the code base that is
using this include transitively. Fix the GN build dependency rules as
well. For a couple of files, remove unused chromeos_buildflags.h
includes to avoid the build rule changes.

Bug: 354842935
Change-Id: I3096a284f1ef1cb4c39f3dfac73b15e76a361422
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6577222
Owners-Override: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1464564}

ash/accelerators/debug_commands.cc

@@ -48,6 +48,7 @@
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/chromeos_buildflags.h"
 #include "chromeos/constants/chromeos_features.h"
 #include "components/prefs/pref_service.h"
 #include "components/vector_icons/vector_icons.h"

ash/constants/ash_features.cc

@@ -10,7 +10,6 @@
 #include "base/metrics/field_trial_params.h"
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
-#include "build/chromeos_buildflags.h"
 #include "chromeos/components/libsegmentation/buildflags.h"
 #include "chromeos/constants/chromeos_features.h"
 

ash/webui/BUILD.gn

@@ -47,6 +47,7 @@ test("ash_webui_unittests") {
     "//ash/webui/status_area_internals:unit_tests",
     "//base",
     "//base/test:test_support",
+    "//build:chromeos_buildflags",
     "//content/test:test_support",
     "//mojo/core/embedder",
     "//ui/accessibility:test_support",

base/BUILD.gn

@@ -1093,10 +1093,6 @@ component("base") {
     "//third_party/abseil-cpp:absl",
   ]
 
-  # TODO(crbug.com/354842935): Remove this dependency once other modules don't
-  # accidentally (transitively) depend on it anymore.
-  public_deps += [ "//build:chromeos_buildflags" ]
-
   if (!is_nacl) {
     sources += [
       "containers/span_rust.h",

base/logging.h

@@ -21,9 +21,6 @@
 #include "base/logging/log_severity.h"
 #include "base/strings/utf_ostream_operators.h"
 #include "build/build_config.h"
-// TODO(crbug.com/354842935): Remove this include once other files don't
-// accidentally (transitively) depend on it anymore.
-#include "build/chromeos_buildflags.h"
 
 #if BUILDFLAG(IS_CHROMEOS)
 #include <cstdio>

base/time/time.h

@@ -77,9 +77,6 @@
 #include "base/compiler_specific.h"
 #include "base/numerics/clamped_math.h"
 #include "build/build_config.h"
-// TODO(crbug.com/354842935): Remove this include once other modules don't
-// accidentally (transitively) depend on it anymore.
-#include "build/chromeos_buildflags.h"
 
 #if BUILDFLAG(IS_FUCHSIA)
 #include <zircon/types.h>

chrome/browser/feedback/feedback_uploader_chrome.h

@@ -9,7 +9,6 @@
 
 #include "base/memory/raw_ptr.h"
 #include "base/task/single_thread_task_runner.h"
-#include "build/chromeos_buildflags.h"
 #include "build/config/chromebox_for_meetings/buildflags.h"
 #include "components/feedback/feedback_uploader.h"
 #include "components/signin/public/identity_manager/access_token_info.h"

chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc

@@ -21,6 +21,7 @@
 #endif
 
 #if BUILDFLAG(IS_CHROMEOS)
+#include "build/chromeos_buildflags.h"
 #include "chrome/browser/ash/system_logs/bluetooth_log_source.h"
 #include "chrome/browser/ash/system_logs/command_line_log_source.h"
 #include "chrome/browser/ash/system_logs/connected_input_devices_log_source.h"

chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc

@@ -17,6 +17,7 @@
 
 #if BUILDFLAG(IS_CHROMEOS)
 #include "base/files/file_path.h"
+#include "build/chromeos_buildflags.h"
 #include "chrome/browser/ash/system_logs/app_service_log_source.h"
 #include "chrome/browser/ash/system_logs/bluetooth_log_source.h"
 #include "chrome/browser/ash/system_logs/command_line_log_source.h"

chrome/browser/smart_card/get_smart_card_context_factory.cc

@@ -4,6 +4,8 @@
 
 #include "chrome/browser/smart_card/get_smart_card_context_factory.h"
 
+#include "build/chromeos_buildflags.h"
+
 #if BUILDFLAG(IS_CHROMEOS_DEVICE)
 #include "chrome/browser/chromeos/extensions/smart_card_provider_private/smart_card_provider_private_api.h"
 #else

chrome/browser/support_tool/support_tool_util.cc

@@ -27,6 +27,7 @@
 #include "third_party/icu/source/i18n/unicode/timezone.h"
 
 #if BUILDFLAG(IS_CHROMEOS)
+#include "build/chromeos_buildflags.h"
 #include "chrome/browser/ash/system_logs/app_service_log_source.h"
 #include "chrome/browser/ash/system_logs/bluetooth_log_source.h"
 #include "chrome/browser/ash/system_logs/command_line_log_source.h"

chromeos/ash/components/kiosk/vision/BUILD.gn

@@ -98,6 +98,7 @@ test("kiosk_vision_unit_tests") {
     ":vision",
     "//base",
     "//base/test:test_support",
+    "//build:chromeos_buildflags",
     "//chromeos/ash/components:test_support",
     "//mojo/core/embedder",
     "//testing/gtest",

chromeos/ash/components/memory/BUILD.gn

@@ -8,6 +8,7 @@ component("memory") {
   defines = [ "IS_ASH_MEMORY_IMPL" ]
   deps = [
     "//base",
+    "//build:chromeos_buildflags",
     "//chromeos/ash/components/dbus",
     "//chromeos/ash/components/dbus/resourced:resourced",
     "//chromeos/ash/components/dbus/swap_management",

content/browser/service_host/utility_process_sandbox_browsertest.cc

@@ -11,7 +11,6 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "build/chromeos_buildflags.h"
 #include "content/browser/service_host/utility_process_host.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"

content/test/BUILD.gn

@@ -564,6 +564,7 @@ static_library("test_support") {
   deps = [
     ":content_test_mojo_bindings",
     ":web_ui_mojo_test_resources",
+    "//build:chromeos_buildflags",
     "//cc:test_support",
     "//cc/slim",
     "//components/attribution_reporting:data_host_mojom",

ui/aura/BUILD.gn

@@ -226,6 +226,7 @@ static_library("test_support") {
   deps = [
     "//base",
     "//base/test:test_support",
+    "//build:chromeos_buildflags",
     "//cc:test_support",
     "//components/viz/test:test_support",
     "//skia",

ui/aura/test/aura_test_helper.cc

@@ -9,6 +9,7 @@
 #include "base/functional/bind.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/aura/client/cursor_shape_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/env.h"

ui/gl/BUILD.gn

@@ -168,6 +168,7 @@ component("gl") {
   deps = [
     ":buildflags",
     "//build:android_buildflags",
+    "//build:chromeos_buildflags",
     "//mojo/public/cpp/bindings",
     "//ui/base:ozone_buildflags",
     "//ui/gfx/mojom",

ui/gl/gl_implementation.cc

@@ -20,6 +20,7 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/gl/angle_implementation.h"
 #include "ui/gl/buildflags.h"
 #include "ui/gl/gl_bindings.h"

ui/webui/webui_util.cc

@@ -10,7 +10,6 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
-#include "build/chromeos_buildflags.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/url_constants.h"
 #include "services/network/public/mojom/content_security_policy.mojom.h"