Implement ShellBrowserTestMainParts and consolidate shell_test_switch… (#8500)

…es.h

Relocate shell_test_switches from cobalt/shell/common to
cobalt/testing/browser_tests/common. Introduce
ShellBrowserTestMainParts to encapsulate browser-test-specific
BrowserMainParts logic, centralizing the toolkit initialization
override for web tests. Move feature overrides for web tests
from CobaltContentBrowserClient to ShellContentBrowserTestClient.
These changes improve codebase organization by isolating
test-specific infrastructure.

Test: Build devel and verified CUJ locally.
Bug: 446892499

Author: haozheng-cobalt

cobalt/browser/cobalt_content_browser_client.cc

@@ -73,10 +73,6 @@
 #include "cobalt/android/browser_jni_headers/CobaltContentBrowserClient_jni.h"
 #endif  // BUILDFLAG(IS_ANDROID)
 
-#if defined(RUN_BROWSER_TESTS)
-#include "cobalt/shell/common/shell_test_switches.h"  // nogncheck
-#endif  // defined(RUN_BROWSER_TESTS)
-
 namespace cobalt {
 
 namespace {
@@ -509,20 +505,6 @@ void CobaltContentBrowserClient::CreateFeatureListAndFieldTrials() {
   std::vector<base::FeatureList::FeatureOverrideInfo> feature_overrides =
       content::GetSwitchDependentFeatureOverrides(command_line);
 
-#if defined(RUN_BROWSER_TESTS)
-  // Overrides for --run-web-tests.
-  if (switches::IsRunWebTestsSwitchPresent()) {
-    // Disable artificial timeouts for PNA-only preflights in warning-only mode
-    // for web tests. We do not exercise this behavior with web tests as it is
-    // intended to be a temporary rollout stage, and the short timeout causes
-    // flakiness when the test server takes just a tad too long to respond.
-    feature_overrides.emplace_back(
-        std::cref(
-            network::features::kPrivateNetworkAccessPreflightShortTimeout),
-        base::FeatureList::OVERRIDE_DISABLE_FEATURE);
-  }
-#endif  // defined(RUN_BROWSER_TESTS)
-
   feature_list->InitFromCommandLine(
       command_line.GetSwitchValueASCII(::switches::kEnableFeatures),
       command_line.GetSwitchValueASCII(::switches::kDisableFeatures));

cobalt/shell/BUILD.gn

@@ -252,10 +252,7 @@ static_library("cobalt_shell_lib") {
   if (run_browser_tests) {
     defines += [ "RUN_BROWSER_TESTS=1" ]
 
-    public_deps += [
-      ":shell_test_switches_lib",
-      "//content/test:test_support",
-    ]
+    public_deps += [ "//content/test:test_support" ]
   }
 
   if (shell_use_toolkit_views) {
@@ -302,15 +299,6 @@ static_library("cobalt_shell_lib") {
   }
 }
 
-source_set("shell_test_switches_lib") {
-  testonly = true
-  sources = [
-    "common/shell_test_switches.cc",
-    "common/shell_test_switches.h",
-  ]
-  deps = [ "//base:base" ]
-}
-
 # This component provides a ContentMainDelegate for Content Shell and derived
 # applications. This delegate is the central place that creates interfaces for
 # each type of process (browser, renderer, etc). This implementation of

cobalt/shell/browser/shell_browser_main_parts.cc

@@ -72,10 +72,6 @@
 #include "ui/linux/linux_ui_factory.h"  // nogncheck
 #endif
 
-#if defined(RUN_BROWSER_TESTS)
-#include "cobalt/shell/common/shell_test_switches.h"  // nogncheck
-#endif  // defined(RUN_BROWSER_TESTS)
-
 #if BUILDFLAG(IS_STARBOARD)
 #include "cobalt/shell/common/device_authentication.h"
 #endif
@@ -157,12 +153,6 @@ void ShellBrowserMainParts::InitializeMessageLoopContext() {
 }
 
 void ShellBrowserMainParts::ToolkitInitialized() {
-#if defined(RUN_BROWSER_TESTS)
-  if (switches::IsRunWebTestsSwitchPresent()) {
-    return;
-  }
-#endif  // defined(RUN_BROWSER_TESTS)
-
 #if BUILDFLAG(IS_LINUX)
   ui::LinuxUi::SetInstance(ui::GetDefaultLinuxUi());
 #endif

cobalt/shell/common/shell_test_switches.h

@@ -399,6 +399,8 @@ static_library("cobalt_shell_test_lib") {
     "app/shell_main_test_delegate.h",
     "browser/shell_browser_test_context.cc",
     "browser/shell_browser_test_context.h",
+    "browser/shell_browser_test_main_parts.cc",
+    "browser/shell_browser_test_main_parts.h",
     "browser/shell_content_browser_test_client.cc",
     "browser/shell_content_browser_test_client.h",
     "browser/test_shell.cc",
@@ -450,6 +452,8 @@ source_set("cobalt_browsertests_support") {
     "common/main_frame_counter_test_impl.h",
     "common/power_monitor_test_impl.cc",
     "common/power_monitor_test_impl.h",
+    "common/shell_test_switches.cc",
+    "common/shell_test_switches.h",
     "renderer/render_frame_test_helper.cc",
     "renderer/render_frame_test_helper.h",
     "renderer/shell_render_frame_observer.cc",
@@ -459,7 +463,6 @@ source_set("cobalt_browsertests_support") {
   public_deps = [
     ":cobalt_browsertests_support_mojom",
     ":shell_controller_mojom",
-    "//cobalt/shell:shell_test_switches_lib",
     "//components/custom_handlers:test_support",
     "//components/metrics:test_support",
     "//components/services/storage/test_api",

cobalt/testing/browser_tests/BUILD.gn

@@ -17,8 +17,8 @@
 #include <iostream>
 
 #include "base/command_line.h"
-#include "cobalt/shell/common/shell_test_switches.h"
 #include "cobalt/testing/browser_tests/common/shell_content_test_client.h"
+#include "cobalt/testing/browser_tests/common/shell_test_switches.h"
 #include "cobalt/testing/browser_tests/utility/shell_content_utility_client.h"
 
 namespace content {

cobalt/testing/browser_tests/app/shell_main_test_delegate.cc

@@ -0,0 +1,41 @@
+// Copyright 2025 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law-or-agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "cobalt/testing/browser_tests/browser/shell_browser_test_main_parts.h"
+
+#include "build/build_config.h"
+#include "cobalt/testing/browser_tests/common/shell_test_switches.h"
+
+#if BUILDFLAG(IS_LINUX)
+#include "ui/linux/linux_ui.h"          // nogncheck
+#include "ui/linux/linux_ui_factory.h"  // nogncheck
+#endif
+
+namespace content {
+
+ShellBrowserTestMainParts::ShellBrowserTestMainParts() = default;
+
+ShellBrowserTestMainParts::~ShellBrowserTestMainParts() = default;
+
+void ShellBrowserTestMainParts::ToolkitInitialized() {
+  if (switches::IsRunWebTestsSwitchPresent()) {
+    return;
+  }
+
+#if BUILDFLAG(IS_LINUX)
+  ui::LinuxUi::SetInstance(ui::GetDefaultLinuxUi());
+#endif
+}
+
+}  // namespace content

cobalt/testing/browser_tests/browser/shell_browser_test_main_parts.cc

@@ -12,19 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cobalt/shell/common/shell_test_switches.h"
+#ifndef COBALT_TESTING_BROWSER_TESTS_BROWSER_SHELL_BROWSER_TEST_MAIN_PARTS_H_
+#define COBALT_TESTING_BROWSER_TESTS_BROWSER_SHELL_BROWSER_TEST_MAIN_PARTS_H_
 
-#include "base/command_line.h"
+#include "cobalt/shell/browser/shell_browser_main_parts.h"
 
-namespace switches {
+namespace content {
 
-const char kExposeInternalsForTesting[] = "expose-internals-for-testing";
+class ShellBrowserTestMainParts : public ShellBrowserMainParts {
+ public:
+  ShellBrowserTestMainParts();
+  ~ShellBrowserTestMainParts() override;
 
-const char kRunWebTests[] = "run-web-tests";
+  // content::BrowserMainParts overrides.
+  void ToolkitInitialized() override;
+};
 
-bool IsRunWebTestsSwitchPresent() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kRunWebTests);
-}
+}  // namespace content
 
-}  // namespace switches
+#endif  // COBALT_TESTING_BROWSER_TESTS_BROWSER_SHELL_BROWSER_TEST_MAIN_PARTS_H_

…balt/shell/common/shell_test_switches.cc …/browser/shell_browser_test_main_parts.hcobalt/shell/common/shell_test_switches.cc renamed to cobalt/testing/browser_tests/browser/shell_browser_test_main_parts.h cobalt/shell/common/shell_test_switches.cc renamed to cobalt/testing/browser_tests/browser/shell_browser_test_main_parts.h

@@ -191,8 +191,8 @@ void ShellContentBrowserTestClient::AppendExtraCommandLineSwitches(
   ShellContentBrowserClient::AppendExtraCommandLineSwitches(command_line,
                                                             child_process_id);
   static const char* kForwardTestSwitches[] = {
-      test_switches::kExposeInternalsForTesting,
-      test_switches::kRunWebTests,
+      switches::kExposeInternalsForTesting,
+      switches::kRunWebTests,
   };
 
   command_line->CopySwitchesFrom(*base::CommandLine::ForCurrentProcess(),
@@ -266,7 +266,7 @@ void ShellContentBrowserTestClient::SetUpFieldTrials() {
   // Overrides for content/shell switches.
 
   // Overrides for --run-web-tests.
-  if (test_switches::IsRunWebTestsSwitchPresent()) {
+  if (switches::IsRunWebTestsSwitchPresent()) {
     // Disable artificial timeouts for PNA-only preflights in warning-only mode
     // for web tests. We do not exercise this behavior with web tests as it is
     // intended to be a temporary rollout stage, and the short timeout causes

cobalt/testing/browser_tests/browser/shell_content_browser_test_client.cc

@@ -46,7 +46,7 @@ TestShell* TestShell::CreateShell(std::unique_ptr<WebContents> web_contents,
   // Note: Do not make RenderFrameHost or RenderViewHost specific state changes
   // here, because they will be forgotten after a cross-process navigation. Use
   // RenderFrameCreated or RenderViewCreated instead.
-  if (test_switches::IsRunWebTestsSwitchPresent()) {
+  if (switches::IsRunWebTestsSwitchPresent()) {
     raw_web_contents->GetMutableRendererPrefs()->use_custom_colors = false;
     raw_web_contents->SyncRendererPrefs();
   }
@@ -151,14 +151,14 @@ bool TestShell::DidAddMessageToConsole(
     const std::u16string& message,
     int32_t line_no,
     const std::u16string& source_id) {
-  return test_switches::IsRunWebTestsSwitchPresent();
+  return switches::IsRunWebTestsSwitchPresent();
 }
 
 PictureInPictureResult TestShell::EnterPictureInPicture(
     WebContents* web_contents) {
   // During tests, returning success to pretend the window was created and allow
   // tests to run accordingly.
-  if (test_switches::IsRunWebTestsSwitchPresent()) {
+  if (switches::IsRunWebTestsSwitchPresent()) {
     return PictureInPictureResult::kSuccess;
   }
   return PictureInPictureResult::kNotSupported;
@@ -168,7 +168,7 @@ void TestShell::SetContentsBounds(WebContents* source,
                                   const gfx::Rect& bounds) {
   DCHECK(source == web_contents());  // There's only one WebContents per Shell.
 
-  if (test_switches::IsRunWebTestsSwitchPresent()) {
+  if (switches::IsRunWebTestsSwitchPresent()) {
     // Note that chrome drops these requests on normal windows.
     // TODO(danakj): The position is dropped here but we use the size. Web tests
     // can't move the window in headless mode anyways, but maybe we should be