cleanup: Remove testonly tag from build targets included in prod build. (#7833)

kjyoun · web-flow · commit 4711be3a15fd · 2025-11-03T10:12:09.000-08:00
This change removes the `testonly = true` declaration from
`//cobalt/browser` and related targets. To do it, it extracts
`shell_switches` into a separate non-testonly target
`//cobalt/shell:cobalt_shell_switches` to prevent prod build targets
from depending on test-only build target(e.g. cobalt_shell_lib)

Bug: 457265539
diff --git a/cobalt/browser/BUILD.gn b/cobalt/browser/BUILD.gn
@@ -91,7 +91,6 @@ source_set("browser") {
 }
 
 source_set("features") {
-  testonly = true
   sources = [
     "features.cc",
     "features.h",
@@ -100,16 +99,14 @@ source_set("features") {
 }
 
 source_set("switches") {
-  testonly = true
-
   sources = [
     "switches.cc",
     "switches.h",
   ]
 
   deps = [
     "//base",
-    "//cobalt/shell:cobalt_shell_lib",
+    "//cobalt/shell:cobalt_shell_switches",
   ]
 }
 
@@ -131,10 +128,6 @@ action("embed_polyfilled_javascript") {
 }
 
 source_set("global_features") {
-  # TODO(cobalt, b/375655377): remove testonly declaration, needed because of
-  # being depended-on by :browser above.
-  testonly = true
-
   sources = [
     "experiments/experiment_config_manager.cc",
     "experiments/experiment_config_manager.h",
@@ -154,10 +147,6 @@ source_set("global_features") {
 }
 
 source_set("metrics") {
-  # TODO(cobalt, b/375655377): remove testonly declaration, needed because of
-  # being depended-on by :browser above.
-  testonly = true
-
   sources = [
     "metrics/cobalt_enabled_state_provider.cc",
     "metrics/cobalt_enabled_state_provider.h",
@@ -170,7 +159,6 @@ source_set("metrics") {
   ]
   deps = [
     "//cobalt/browser/h5vcc_metrics/public/mojom",
-    "//cobalt/shell:cobalt_shell_lib",
     "//components/metrics",
     "//components/metrics_services_manager",
     "//components/prefs",
diff --git a/cobalt/browser/h5vcc_experiments/BUILD.gn b/cobalt/browser/h5vcc_experiments/BUILD.gn
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 source_set("h5vcc_experiments") {
-  testonly = true
   sources = [
     "h5vcc_experiments_impl.cc",
     "h5vcc_experiments_impl.h",
diff --git a/cobalt/browser/h5vcc_metrics/BUILD.gn b/cobalt/browser/h5vcc_metrics/BUILD.gn
@@ -13,10 +13,6 @@
 # limitations under the License.
 
 source_set("h5vcc_metrics") {
-  # TODO(cobalt, b/375655377): remove testonly declaration, needed because of
-  # being depended-on by :browser above.
-  testonly = true
-
   sources = [
     "h5vcc_metrics_impl.cc",
     "h5vcc_metrics_impl.h",
diff --git a/cobalt/browser/metrics/cobalt_metrics_services_manager_client.cc b/cobalt/browser/metrics/cobalt_metrics_services_manager_client.cc
@@ -20,7 +20,6 @@
 #include "base/path_service.h"
 #include "cobalt/browser/metrics/cobalt_enabled_state_provider.h"
 #include "cobalt/browser/metrics/cobalt_metrics_service_client.h"
-#include "cobalt/shell/common/shell_paths.h"
 #include "components/metrics/client_info.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_service_client.h"
diff --git a/cobalt/browser/migrate_storage_record/migration_manager.cc b/cobalt/browser/migrate_storage_record/migration_manager.cc
@@ -28,6 +28,7 @@
 #include "base/time/time.h"
 #include "base/timer/elapsed_timer.h"
 #include "cobalt/browser/switches.h"
+#include "cobalt/shell/common/shell_switches.h"
 #include "components/url_matcher/url_util.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/storage_partition.h"
diff --git a/cobalt/browser/switches.cc b/cobalt/browser/switches.cc
@@ -14,6 +14,8 @@
 
 #include "cobalt/browser/switches.h"
 
+#include "cobalt/shell/common/shell_switches.h"
+
 namespace cobalt {
 namespace switches {
 
diff --git a/cobalt/browser/switches.h b/cobalt/browser/switches.h
@@ -15,7 +15,6 @@
 #include <string>
 
 #include "base/command_line.h"
-#include "cobalt/shell/common/shell_switches.h"
 
 #ifndef COBALT_BROWSER_SWITCHES_H_
 #define COBALT_BROWSER_SWITCHES_H_
diff --git a/cobalt/shell/BUILD.gn b/cobalt/shell/BUILD.gn
@@ -206,9 +206,19 @@ source_set("browsertests_sources") {
   }
 }
 
+static_library("cobalt_shell_switches") {
+  sources = [
+    "common/shell_switches.cc",
+    "common/shell_switches.h",
+  ]
+}
+
 static_library("cobalt_shell_lib") {
   testonly = true
-  public_deps = [ ":cobalt_shell_lib_deps" ]
+  public_deps = [
+    ":cobalt_shell_lib_deps",
+    ":cobalt_shell_switches",
+  ]
   sources = [
     "browser/shell.cc",
     "browser/shell.h",
@@ -241,8 +251,6 @@ static_library("cobalt_shell_lib") {
     "common/shell_content_client.h",
     "common/shell_paths.cc",
     "common/shell_paths.h",
-    "common/shell_switches.cc",
-    "common/shell_switches.h",
     "gpu/shell_content_gpu_client.cc",
     "gpu/shell_content_gpu_client.h",
     "renderer/shell_content_renderer_client.cc",
diff --git a/cobalt/shell/common/shell_switches.cc b/cobalt/shell/common/shell_switches.cc
@@ -14,8 +14,6 @@
 
 #include "cobalt/shell/common/shell_switches.h"
 
-#include "base/command_line.h"
-
 namespace switches {
 
 // Makes Content Shell use the given path for its data directory.
diff --git a/cobalt/shell/common/shell_switches.h b/cobalt/shell/common/shell_switches.h
@@ -17,8 +17,6 @@
 #ifndef COBALT_SHELL_COMMON_SHELL_SWITCHES_H_
 #define COBALT_SHELL_COMMON_SHELL_SWITCHES_H_
 
-#include "build/build_config.h"
-
 namespace switches {
 
 constexpr char kDefaultURL[] = "https://www.youtube.com/tv/splash";
