mirror of
https://github.com/Alex313031/thorium.git
synced 2025-01-09 19:37:30 -03:00
M122 stage 4
This commit is contained in:
Alexander Frick
parent
45843a4d8b
commit
8a2a4745aa
9 changed files with 130 additions and 95 deletions
74
src/BUILD.gn
74
src/BUILD.gn
|
|
@ -20,6 +20,7 @@ import("//build/config/ui.gni")
|
|||
import("//build/gn_logs.gni")
|
||||
import("//build/util/generate_wrapper.gni")
|
||||
import("//chrome/browser/buildflags.gni")
|
||||
import("//components/enterprise/buildflags/buildflags.gni")
|
||||
import("//components/nacl/features.gni")
|
||||
import("//device/vr/buildflags/buildflags.gni")
|
||||
import("//extensions/buildflags/buildflags.gni")
|
||||
|
|
@ -144,11 +145,15 @@ group("gn_all") {
|
|||
}
|
||||
|
||||
if (!is_ios && !is_android && !is_castos) {
|
||||
if (!is_fuchsia) {
|
||||
deps += [
|
||||
"//chrome",
|
||||
"//chrome/browser/ui/actions:dump_actions",
|
||||
"//chrome/browser/ui/color:dump_colors",
|
||||
"//chrome/test:browser_tests",
|
||||
]
|
||||
}
|
||||
deps += [
|
||||
"//chrome",
|
||||
"//chrome/browser/ui/actions:dump_actions",
|
||||
"//chrome/browser/ui/color:dump_colors",
|
||||
"//chrome/test:browser_tests",
|
||||
"//components/subresource_filter/tools:subresource_filter_tools",
|
||||
"//components/zucchini:zucchini",
|
||||
"//gpu/gles2_conform_support:gles2_conform_test",
|
||||
|
|
@ -163,7 +168,7 @@ group("gn_all") {
|
|||
]
|
||||
}
|
||||
|
||||
if (!is_castos) {
|
||||
if (!is_castos && !is_fuchsia) {
|
||||
deps += [ "//chrome/installer" ]
|
||||
}
|
||||
|
||||
|
|
@ -183,10 +188,10 @@ group("gn_all") {
|
|||
}
|
||||
|
||||
if (!is_ios && !is_castos) {
|
||||
deps += [
|
||||
"//chrome/test:unit_tests",
|
||||
"//ui/accessibility:accessibility_unittests",
|
||||
]
|
||||
if (!is_fuchsia) {
|
||||
deps += [ "//chrome/test:unit_tests" ]
|
||||
}
|
||||
deps += [ "//ui/accessibility:accessibility_unittests" ]
|
||||
}
|
||||
|
||||
if (use_blink) {
|
||||
|
|
@ -252,7 +257,7 @@ group("gn_all") {
|
|||
"//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
|
||||
]
|
||||
if (!is_android) {
|
||||
if (!is_castos) {
|
||||
if (!is_castos && !is_fuchsia) {
|
||||
deps += [ "//chrome/test:telemetry_perf_unittests" ]
|
||||
}
|
||||
} else {
|
||||
|
|
@ -273,7 +278,6 @@ group("gn_all") {
|
|||
deps += [
|
||||
":d8_fuchsia",
|
||||
"//build/fuchsia/cipd",
|
||||
"//chrome/app:chrome_fuchsia",
|
||||
"//fuchsia_web:gn_all",
|
||||
"//tools/fuchsia/size_tests:fuchsia_sizes",
|
||||
|
||||
|
|
@ -299,7 +303,7 @@ group("gn_all") {
|
|||
|
||||
if (enable_ml_internal) {
|
||||
deps +=
|
||||
[ "//components/optimization_guide/internal:text_generator_example" ]
|
||||
[ "//components/optimization_guide/internal:ondevice_model_example" ]
|
||||
}
|
||||
|
||||
if (enable_pdf) {
|
||||
|
|
@ -322,6 +326,10 @@ group("gn_all") {
|
|||
]
|
||||
}
|
||||
|
||||
if (enterprise_watermark) {
|
||||
deps += [ "//chrome/browser/enterprise/watermark:watermark_app" ]
|
||||
}
|
||||
|
||||
if (use_aura) {
|
||||
deps += [
|
||||
"//ui/aura:aura_demo",
|
||||
|
|
@ -539,7 +547,7 @@ group("gn_all") {
|
|||
]
|
||||
}
|
||||
|
||||
if (!is_android && !is_castos && !is_ios) {
|
||||
if (!is_android && !is_castos && !is_ios && !is_fuchsia) {
|
||||
deps += [
|
||||
"//chrome/test:load_library_perf_tests",
|
||||
"//chrome/test:sync_performance_tests",
|
||||
|
|
@ -859,7 +867,7 @@ group("all_rust") {
|
|||
|
||||
if (enable_rust_mojo) {
|
||||
deps += [
|
||||
"//mojo/public/rust",
|
||||
"//mojo/public/rust:mojo_rust",
|
||||
"//mojo/public/rust:mojo_rust_integration_unittests",
|
||||
"//mojo/public/rust:mojo_rust_unittests",
|
||||
]
|
||||
|
|
@ -1114,6 +1122,7 @@ if (use_blink && !is_cronet_build) {
|
|||
]
|
||||
data_deps = [
|
||||
":blink_web_tests_expectations",
|
||||
":blink_web_tests_support_data",
|
||||
"//chrome:chrome",
|
||||
"//chrome/test/chromedriver:chromedriver_server",
|
||||
"//third_party/blink/tools:wpt_tests_isolate",
|
||||
|
|
@ -1449,8 +1458,8 @@ if (use_blink && !is_cronet_build) {
|
|||
]
|
||||
}
|
||||
|
||||
# flag-specific tests only runs on linux as of now
|
||||
if (is_linux) {
|
||||
# flag-specific tests only runs on linux & mac as of now
|
||||
if (is_linux || is_mac) {
|
||||
data += [
|
||||
"//third_party/blink/web_tests/FlagSpecificConfig",
|
||||
"//third_party/blink/web_tests/FlagExpectations/",
|
||||
|
|
@ -1558,9 +1567,13 @@ if (use_blink && !is_cronet_build) {
|
|||
|
||||
script_test("blink_python_tests") {
|
||||
script = "//testing/scripts/run_isolated_script_test.py"
|
||||
args = [ "@WrappedPath(" +
|
||||
rebase_path("//third_party/blink/tools/run_blinkpy_tests.py",
|
||||
root_build_dir) + ")" ]
|
||||
args = [
|
||||
"@WrappedPath(" +
|
||||
rebase_path("//third_party/blink/tools/run_blinkpy_tests.py",
|
||||
root_build_dir) + ")",
|
||||
"-v",
|
||||
"-t",
|
||||
]
|
||||
|
||||
data = [
|
||||
# These tests use //build/android/devil_chromium.py even when !is_android,
|
||||
|
|
@ -1622,8 +1635,6 @@ group("chromium_builder_perf") {
|
|||
|
||||
if (!is_ios && !is_android && !is_castos && !is_cronet_build) {
|
||||
data_deps = [
|
||||
"//chrome/test:load_library_perf_tests",
|
||||
"//chrome/test:performance_test_suite",
|
||||
"//components/tracing:tracing_perftests",
|
||||
"//gpu:command_buffer_perftests",
|
||||
"//gpu:gpu_perftests",
|
||||
|
|
@ -1631,7 +1642,14 @@ group("chromium_builder_perf") {
|
|||
"//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
|
||||
]
|
||||
|
||||
if (!is_chromeos_ash && !(is_fuchsia && optimize_for_size)) {
|
||||
if (!is_fuchsia) {
|
||||
data_deps += [
|
||||
"//chrome/test:load_library_perf_tests",
|
||||
"//chrome/test:performance_test_suite",
|
||||
]
|
||||
}
|
||||
|
||||
if (!is_chromeos_ash && !is_fuchsia) {
|
||||
data_deps += [ "//chrome/test:performance_browser_tests" ]
|
||||
}
|
||||
|
||||
|
|
@ -1659,13 +1677,6 @@ group("chromium_builder_perf") {
|
|||
"//third_party/angle/src/tests:angle_perftests",
|
||||
]
|
||||
}
|
||||
|
||||
# An `if (is_fuchsia)` condition in //chrome/test/BUILD.gn prevents this
|
||||
# target from being defined.
|
||||
# TODO(crbug.com/1310086): Resolve that and remove this exception.
|
||||
if (is_fuchsia) {
|
||||
data_deps -= [ "//chrome/test:performance_test_suite" ]
|
||||
}
|
||||
}
|
||||
|
||||
if (!is_ios && !is_android && !is_castos && !is_cronet_build) {
|
||||
|
|
@ -1673,11 +1684,13 @@ if (!is_ios && !is_android && !is_castos && !is_cronet_build) {
|
|||
testonly = true
|
||||
|
||||
deps = [
|
||||
"//chrome:chrome",
|
||||
"//content/shell:thorium_shell",
|
||||
"//third_party/blink/public/mojom:mojom_modules_js",
|
||||
"//v8:d8",
|
||||
]
|
||||
if (!is_fuchsia) {
|
||||
deps += [ "//chrome:chrome" ]
|
||||
}
|
||||
if (!is_win) {
|
||||
deps += [ "//skia:filter_fuzz_stub" ]
|
||||
}
|
||||
|
|
@ -1732,7 +1745,6 @@ if (is_chromeos_ash && enable_js_type_check) {
|
|||
"chrome/test/data/webui:closure_compile",
|
||||
"mojo/public/tools/bindings/generators/js_templates/lite/test:closure_compile",
|
||||
"mojo/public/tools/bindings/generators/js_templates/lite/test:closure_compile_modules",
|
||||
"ui/file_manager:closure_compile",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ def check_distro(options):
|
|||
distro_id = subprocess.check_output(["lsb_release", "--id",
|
||||
"--short"]).decode().strip()
|
||||
|
||||
supported_codenames = ["bionic", "focal", "jammy", "mantic"]
|
||||
supported_codenames = ["bionic", "focal", "jammy", "noble"]
|
||||
supported_ids = ["Debian"]
|
||||
|
||||
if (distro_codename() not in supported_codenames
|
||||
|
|
@ -160,7 +160,7 @@ def check_distro(options):
|
|||
"\tUbuntu 18.04 LTS (bionic with EoL April 2028)",
|
||||
"\tUbuntu 20.04 LTS (focal with EoL April 2030)",
|
||||
"\tUbuntu 22.04 LTS (jammy with EoL April 2032)",
|
||||
"\tUbuntu 23.10 (mantic)",
|
||||
"\tUbuntu 24.04 LTS (noble with EoL June 2029)",
|
||||
"\tDebian 10 (buster), 11 (bullseye) or 12 (bookworm)",
|
||||
sep="\n",
|
||||
file=sys.stderr,
|
||||
|
|
@ -348,7 +348,6 @@ def lib_list():
|
|||
"libglib2.0-0",
|
||||
"libgl1",
|
||||
"libgtk-3-0",
|
||||
"libncurses5",
|
||||
"libpam0g",
|
||||
"libpango-1.0-0",
|
||||
"libpangocairo-1.0-0",
|
||||
|
|
@ -377,7 +376,8 @@ def lib_list():
|
|||
"libxrender1",
|
||||
"libxtst6",
|
||||
"x11-utils",
|
||||
"xorg", # TODO(crbug.com/1417069): Experimental.
|
||||
"xserver-xorg-core", # TODO(crbug.com/1417069): Experimental.
|
||||
"xserver-xorg-video-dummy", # TODO(crbug.com/1417069): Experimental.
|
||||
"xvfb",
|
||||
"zlib1g",
|
||||
]
|
||||
|
|
@ -416,6 +416,12 @@ def lib_list():
|
|||
if package_exists("libinput10"):
|
||||
packages.append("libinput10")
|
||||
|
||||
# Work around for dependency on Ubuntu 24.04 LTS (noble)
|
||||
if distro_codename() == "noble":
|
||||
packages.append("libncurses6")
|
||||
else:
|
||||
packages.append("libncurses5")
|
||||
|
||||
return packages
|
||||
|
||||
|
||||
|
|
@ -437,7 +443,6 @@ def lib32_list(options):
|
|||
"libegl1:i386",
|
||||
"libgl1:i386",
|
||||
"libglib2.0-0:i386",
|
||||
"libncurses5:i386",
|
||||
"libnss3:i386",
|
||||
"libpango-1.0-0:i386",
|
||||
"libpangocairo-1.0-0:i386",
|
||||
|
|
@ -470,6 +475,12 @@ def lib32_list(options):
|
|||
pattern = re.compile(r"g\+\+-[0-9.]+-multilib")
|
||||
packages += re.findall(pattern, lines)
|
||||
|
||||
# Work around for 32-bit dependency on Ubuntu 24.04 LTS (noble)
|
||||
if distro_codename() == "noble":
|
||||
packages.append("libncurses6:i386")
|
||||
else:
|
||||
packages.append("libncurses5:i386")
|
||||
|
||||
return packages
|
||||
|
||||
|
||||
|
|
@ -625,7 +636,7 @@ def arm_list(options):
|
|||
"g++-11-arm-linux-gnueabihf",
|
||||
"gcc-11-arm-linux-gnueabihf",
|
||||
])
|
||||
elif distro_codename() == "mantic":
|
||||
elif distro_codename() == "noble":
|
||||
packages.extend([
|
||||
"gcc-arm-linux-gnueabihf",
|
||||
"g++-11-arm-linux-gnueabihf",
|
||||
|
|
@ -652,8 +663,6 @@ def nacl_list(options):
|
|||
"libfontconfig1:i386",
|
||||
"libglib2.0-0:i386",
|
||||
"libgpm2:i386",
|
||||
"libncurses5:i386",
|
||||
"lib32ncurses5-dev",
|
||||
"libnss3:i386",
|
||||
"libpango-1.0-0:i386",
|
||||
"libssl-dev:i386",
|
||||
|
|
@ -699,6 +708,14 @@ def nacl_list(options):
|
|||
else:
|
||||
packages.append("libudev0:i386")
|
||||
|
||||
# Work around for nacl dependency on Ubuntu 24.04 LTS (noble)
|
||||
if distro_codename() == "noble":
|
||||
packages.append("libncurses6:i386")
|
||||
packages.append("lib32ncurses-dev")
|
||||
else:
|
||||
packages.append("libncurses5:i386")
|
||||
packages.append("lib32ncurses5-dev")
|
||||
|
||||
return packages
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -796,7 +796,7 @@ std::u16string GetApplicationNameForScheme(const GURL& url) {
|
|||
}
|
||||
|
||||
return application_name.empty() ? u"xdg-open"
|
||||
: base::ASCIIToUTF16(application_name);
|
||||
: base::UTF8ToUTF16(application_name);
|
||||
}
|
||||
|
||||
DefaultWebClientState GetDefaultBrowser() {
|
||||
|
|
|
|||
|
|
@ -383,7 +383,7 @@ class CrostiniCreditsHandler
|
|||
// Linux credits contents that was loaded from file.
|
||||
std::string contents_;
|
||||
|
||||
raw_ptr<Profile, ExperimentalAsh> profile_;
|
||||
raw_ptr<Profile> profile_;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -127,7 +127,8 @@ const IS_MOBILE = /Android/.test(window.navigator.userAgent) || IS_IOS;
|
|||
const IS_RTL = document.querySelector('html').dir == 'rtl';
|
||||
|
||||
/** @const */
|
||||
const ARCADE_MODE_URL = 'Thorium Dino';
|
||||
/** const ARCADE_MODE_URL = 'Thorium Dino'; */
|
||||
const ARCADE_MODE_URL = 'chrome://dino/';
|
||||
|
||||
/** @const */
|
||||
const RESOURCE_POSTFIX = 'offline-resources-';
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ IN_PROC_BROWSER_TEST_F(LaunchAsMojoClientBrowserTest, LaunchAndBindInterface) {
|
|||
base::RunLoop loop;
|
||||
shell_controller->GetSwitchValue(
|
||||
kExtraSwitchName,
|
||||
base::BindLambdaForTesting([&](const absl::optional<std::string>& value) {
|
||||
base::BindLambdaForTesting([&](const std::optional<std::string>& value) {
|
||||
ASSERT_TRUE(value);
|
||||
EXPECT_EQ(kExtraSwitchValue, *value);
|
||||
loop.Quit();
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ END
|
|||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
IDR_MAINFRAME ICON "thorium_shell.ico"
|
||||
// IDI_THORIUM_SHELL ICON "thorium_shell.ico"
|
||||
IDR_MAINFRAME ICON "thorium_shell.ico"
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ ShellMainDelegate::ShellMainDelegate(bool is_content_browsertests)
|
|||
ShellMainDelegate::~ShellMainDelegate() {
|
||||
}
|
||||
|
||||
absl::optional<int> ShellMainDelegate::BasicStartupComplete() {
|
||||
std::optional<int> ShellMainDelegate::BasicStartupComplete() {
|
||||
base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
|
||||
if (command_line.HasSwitch("run-layout-test")) {
|
||||
std::cerr << std::string(79, '*') << "\n"
|
||||
|
|
@ -195,7 +195,7 @@ absl::optional<int> ShellMainDelegate::BasicStartupComplete() {
|
|||
|
||||
RegisterShellPathProvider();
|
||||
|
||||
return absl::nullopt;
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
bool ShellMainDelegate::ShouldCreateFeatureList(InvokedIn invoked_in) {
|
||||
|
|
@ -348,19 +348,18 @@ void ShellMainDelegate::InitializeResourceBundle() {
|
|||
#endif
|
||||
}
|
||||
|
||||
absl::optional<int> ShellMainDelegate::PreBrowserMain() {
|
||||
absl::optional<int> exit_code =
|
||||
content::ContentMainDelegate::PreBrowserMain();
|
||||
std::optional<int> ShellMainDelegate::PreBrowserMain() {
|
||||
std::optional<int> exit_code = content::ContentMainDelegate::PreBrowserMain();
|
||||
if (exit_code.has_value())
|
||||
return exit_code;
|
||||
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
RegisterShellCrApp();
|
||||
#endif
|
||||
return absl::nullopt;
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
absl::optional<int> ShellMainDelegate::PostEarlyInitialization(
|
||||
std::optional<int> ShellMainDelegate::PostEarlyInitialization(
|
||||
InvokedIn invoked_in) {
|
||||
if (!ShouldCreateFeatureList(invoked_in)) {
|
||||
// Apply field trial testing configuration since content did not.
|
||||
|
|
@ -399,7 +398,7 @@ absl::optional<int> ShellMainDelegate::PostEarlyInitialization(
|
|||
process_type)
|
||||
.Initialize(memory_system_);
|
||||
|
||||
return absl::nullopt;
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
ContentClient* ShellMainDelegate::CreateContentClient() {
|
||||
|
|
|
|||
|
|
@ -106,6 +106,8 @@ static_library("test_support") {
|
|||
"../browser/media/session/mock_media_session_player_observer.h",
|
||||
"../browser/media/session/mock_media_session_service_impl.cc",
|
||||
"../browser/media/session/mock_media_session_service_impl.h",
|
||||
"../browser/payments/stub_payment_credential.cc",
|
||||
"../browser/payments/stub_payment_credential.h",
|
||||
"../browser/preloading/prefetch/prefetch_test_utils.cc",
|
||||
"../browser/preloading/prefetch/prefetch_test_utils.h",
|
||||
"../browser/presentation/presentation_test_utils.cc",
|
||||
|
|
@ -141,8 +143,6 @@ static_library("test_support") {
|
|||
"../browser/web_package/mock_signed_exchange_handler.cc",
|
||||
"../browser/web_package/mock_signed_exchange_handler.h",
|
||||
"../browser/web_package/signed_exchange_test_utils.h",
|
||||
"../browser/webui/test_webui_js_bridge_ui.cc",
|
||||
"../browser/webui/test_webui_js_bridge_ui.h",
|
||||
"../browser/worker_host/test_shared_worker_service_impl.cc",
|
||||
"../browser/worker_host/test_shared_worker_service_impl.h",
|
||||
"../public/test/accessibility_notification_waiter.cc",
|
||||
|
|
@ -272,6 +272,7 @@ static_library("test_support") {
|
|||
"../public/test/render_frame_host_test_support.h",
|
||||
"../public/test/render_view_test.cc",
|
||||
"../public/test/render_view_test.h",
|
||||
"../public/test/scoped_accessibility_mode_override.cc",
|
||||
"../public/test/scoped_accessibility_mode_override.h",
|
||||
"../public/test/scoped_overscroll_modes.cc",
|
||||
"../public/test/scoped_overscroll_modes.h",
|
||||
|
|
@ -351,6 +352,8 @@ static_library("test_support") {
|
|||
"../public/test/url_loader_interceptor.h",
|
||||
"../public/test/url_loader_monitor.cc",
|
||||
"../public/test/url_loader_monitor.h",
|
||||
"../public/test/web_contents_observer_test_utils.cc",
|
||||
"../public/test/web_contents_observer_test_utils.h",
|
||||
"../public/test/web_contents_tester.cc",
|
||||
"../public/test/web_contents_tester.h",
|
||||
"../public/test/web_transport_simple_test_server.cc",
|
||||
|
|
@ -469,8 +472,6 @@ static_library("test_support") {
|
|||
"test_web_contents_factory.cc",
|
||||
"web_contents_observer_consistency_checker.cc",
|
||||
"web_contents_observer_consistency_checker.h",
|
||||
"web_contents_observer_test_utils.cc",
|
||||
"web_contents_observer_test_utils.h",
|
||||
]
|
||||
|
||||
configs += [
|
||||
|
|
@ -587,6 +588,7 @@ static_library("test_support") {
|
|||
"//ui/base/clipboard",
|
||||
"//ui/base/clipboard:clipboard_test_support",
|
||||
"//ui/base/ime",
|
||||
"//ui/color:mixers",
|
||||
"//ui/compositor:test_support",
|
||||
"//ui/display",
|
||||
"//ui/events:dom_keycode_converter",
|
||||
|
|
@ -627,6 +629,8 @@ static_library("test_support") {
|
|||
sources += [
|
||||
"../browser/serial/serial_test_utils.cc",
|
||||
"../browser/serial/serial_test_utils.h",
|
||||
"../public/test/mock_captured_surface_controller.cc",
|
||||
"../public/test/mock_captured_surface_controller.h",
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -824,9 +828,6 @@ if (is_fuchsia) {
|
|||
"//testing:run_perf_test",
|
||||
"//tools/perf/:perf",
|
||||
]
|
||||
if (!optimize_for_size) {
|
||||
data_deps += [ "//chrome/test:sync_performance_tests" ]
|
||||
}
|
||||
}
|
||||
group("fuchsia_telemetry_test_data") {
|
||||
testonly = true
|
||||
|
|
@ -1058,7 +1059,6 @@ mojom("content_test_mojo_bindings") {
|
|||
"../public/test/mojo_capability_control_test_interfaces.mojom",
|
||||
"../public/test/test_service.mojom",
|
||||
"frame_host_test_interface.mojom",
|
||||
"test_browser_associated_interfaces.mojom",
|
||||
]
|
||||
public_deps = [
|
||||
"//mojo/public/mojom/base",
|
||||
|
|
@ -1081,17 +1081,13 @@ if (is_chromeos_ash) {
|
|||
|
||||
# Generate WebUI bindings in JavaScript instead of TypeScript. This is
|
||||
# necessary since this target is intentionally testing JS WebUI bindings.
|
||||
use_typescript_sources = false
|
||||
generate_webui_js_bindings = true
|
||||
}
|
||||
}
|
||||
|
||||
mojom_with_webui_js_bridge("web_ui_js_bridge_test_bindings") {
|
||||
mojom("web_ui_managed_interface_tests_bindings") {
|
||||
testonly = true
|
||||
source = "data/web_ui_managed_interface_test.test-mojom"
|
||||
|
||||
webui_controller = "content::TestWebUIJsBridgeUI"
|
||||
webui_controller_header = "//content/browser/webui/test_webui_js_bridge_ui.h"
|
||||
webui_controller_deps = [ "//content/test:test_support" ]
|
||||
sources = [ "data/web_ui_managed_interface_test.test-mojom" ]
|
||||
|
||||
webui_module_path = "/content/test/data"
|
||||
}
|
||||
|
|
@ -1144,7 +1140,7 @@ ts_library("web_ui_mojo_test_build_ts") {
|
|||
deps = [ "//ui/webui/resources/mojo:build_ts" ]
|
||||
extra_deps = [
|
||||
":preprocess_mojo_webui_test",
|
||||
":web_ui_js_bridge_test_bindings_ts__generator",
|
||||
":web_ui_managed_interface_tests_bindings_ts__generator",
|
||||
":web_ui_ts_test_mojo_bindings_ts__generator",
|
||||
]
|
||||
}
|
||||
|
|
@ -1306,6 +1302,7 @@ test("content_browsertests") {
|
|||
"../browser/accessibility/hit_testing_browsertest.cc",
|
||||
"../browser/accessibility/hit_testing_browsertest.h",
|
||||
"../browser/accessibility/line_layout_browsertest.cc",
|
||||
"../browser/accessibility/scoped_accessibility_mode_browsertest.cc",
|
||||
"../browser/accessibility/site_per_process_accessibility_browsertest.cc",
|
||||
"../browser/accessibility/snapshot_ax_tree_browsertest.cc",
|
||||
"../browser/accessibility/touch_accessibility_aura_browsertest.cc",
|
||||
|
|
@ -1344,6 +1341,7 @@ test("content_browsertests") {
|
|||
"../browser/closewatcher/close_listener_host_browsertest.cc",
|
||||
"../browser/code_cache/generated_code_cache_browsertest.cc",
|
||||
"../browser/compute_pressure/compute_pressure_origin_trial_browsertest.cc",
|
||||
"../browser/compute_pressure/pressure_service_browsertest.cc",
|
||||
"../browser/content_index/content_index_browsertest.cc",
|
||||
"../browser/content_security_policy_browsertest.cc",
|
||||
"../browser/cookie_deprecation_label/cookie_deprecation_label_browsertest.cc",
|
||||
|
|
@ -1409,7 +1407,6 @@ test("content_browsertests") {
|
|||
"../browser/loader/prefetch_browsertest_base.cc",
|
||||
"../browser/loader/prefetch_browsertest_base.h",
|
||||
"../browser/loader/reload_cache_control_browsertest.cc",
|
||||
"../browser/loader/resource_cache_browsertest.cc",
|
||||
"../browser/loader/resource_scheduler_browsertest.cc",
|
||||
"../browser/locks/lock_manager_browsertest.cc",
|
||||
"../browser/manifest/manifest_browsertest.cc",
|
||||
|
|
@ -1431,6 +1428,7 @@ test("content_browsertests") {
|
|||
"../browser/media/session/media_session_impl_visibility_browsertest.cc",
|
||||
"../browser/media/session/media_session_service_impl_browsertest.cc",
|
||||
"../browser/media/webaudio/audio_context_manager_browsertest.cc",
|
||||
"../browser/message_port_close_event_browsertest.cc",
|
||||
"../browser/message_port_provider_browsertest.cc",
|
||||
"../browser/mojo_sandbox_browsertest.cc",
|
||||
"../browser/navigation_browsertest.cc",
|
||||
|
|
@ -1612,7 +1610,6 @@ test("content_browsertests") {
|
|||
"../browser/webrtc/webrtc_video_capture_shared_device_browsertest.cc",
|
||||
"../browser/webrtc/webrtc_webcam_browsertest.cc",
|
||||
"../browser/webrtc/webrtc_webcam_browsertest.h",
|
||||
"../browser/webui/web_ui_browser_interface_broker_registry_browsertest.cc",
|
||||
"../browser/webui/web_ui_browsertest.cc",
|
||||
"../browser/webui/web_ui_managed_interface_browsertest.cc",
|
||||
"../browser/webui/web_ui_mojo_browsertest.cc",
|
||||
|
|
@ -1625,7 +1622,7 @@ test("content_browsertests") {
|
|||
"../renderer/blink_platform_audio_hardware_browsertest.cc",
|
||||
"../renderer/fluent_scrollbar_browsertest.cc",
|
||||
"../renderer/gin_browsertest.cc",
|
||||
"../renderer/media/renderer_webmediaplayer_delegate_browsertest.cc",
|
||||
"../renderer/media/renderer_web_media_player_delegate_browsertest.cc",
|
||||
"../renderer/media/too_many_web_media_players_intervention_browsertest.cc",
|
||||
"../renderer/render_frame_impl_browsertest.cc",
|
||||
"../renderer/render_thread_impl_browsertest.cc",
|
||||
|
|
@ -1684,8 +1681,7 @@ test("content_browsertests") {
|
|||
":browsertest_support",
|
||||
":content_test_mojo_bindings",
|
||||
":test_support",
|
||||
":web_ui_js_bridge_test_bindings__generator",
|
||||
":web_ui_js_bridge_test_bindings_webui_js_bridge_impl",
|
||||
":web_ui_managed_interface_tests_bindings",
|
||||
":web_ui_ts_test_mojo_bindings",
|
||||
"//base/test:proto_test_support",
|
||||
"//base/test:test_support",
|
||||
|
|
@ -1817,6 +1813,12 @@ test("content_browsertests") {
|
|||
"//third_party/mesa_headers",
|
||||
]
|
||||
|
||||
data = [
|
||||
"data/",
|
||||
"//media/test/data/",
|
||||
"$root_gen_dir/third_party/perfetto/protos/perfetto/config/chrome/scenario_config.descriptor",
|
||||
]
|
||||
|
||||
if (is_ios) {
|
||||
bundle_deps = [
|
||||
":content_test_bundle_data",
|
||||
|
|
@ -1825,11 +1827,6 @@ test("content_browsertests") {
|
|||
"//testing/buildbot/filters:content_browsertests_filter_bundle_data",
|
||||
]
|
||||
} else {
|
||||
data = [
|
||||
"data/",
|
||||
"//media/test/data/",
|
||||
"$root_gen_dir/third_party/perfetto/protos/perfetto/config/chrome/scenario_config.descriptor",
|
||||
]
|
||||
data_deps += [
|
||||
"//testing/buildbot/filters:content_browsertests_filters",
|
||||
"//third_party/perfetto/protos/perfetto/config/chrome:scenario_descriptor",
|
||||
|
|
@ -2285,6 +2282,7 @@ test("content_unittests") {
|
|||
"../browser/accessibility/browser_accessibility_state_impl_unittest.cc",
|
||||
"../browser/accessibility/browser_accessibility_unittest.cc",
|
||||
"../browser/accessibility/one_shot_accessibility_tree_search_unittest.cc",
|
||||
"../browser/accessibility/scoped_mode_collection_unittest.cc",
|
||||
"../browser/aggregation_service/aggregatable_report_assembler_unittest.cc",
|
||||
"../browser/aggregation_service/aggregatable_report_scheduler_unittest.cc",
|
||||
"../browser/aggregation_service/aggregatable_report_sender_unittest.cc",
|
||||
|
|
@ -2310,6 +2308,7 @@ test("content_unittests") {
|
|||
"../browser/attribution_reporting/attribution_storage_sql_migrations_unittest.cc",
|
||||
"../browser/attribution_reporting/attribution_storage_sql_unittest.cc",
|
||||
"../browser/attribution_reporting/attribution_storage_unittest.cc",
|
||||
"../browser/attribution_reporting/attribution_suitable_context_unittest.cc",
|
||||
"../browser/attribution_reporting/privacy_math_unittest.cc",
|
||||
"../browser/attribution_reporting/rate_limit_table_unittest.cc",
|
||||
"../browser/background_fetch/background_fetch_cross_origin_filter_unittest.cc",
|
||||
|
|
@ -2342,7 +2341,6 @@ test("content_unittests") {
|
|||
"../browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc",
|
||||
"../browser/bluetooth/web_bluetooth_pairing_manager_impl_unittest.cc",
|
||||
"../browser/bluetooth/web_bluetooth_service_impl_unittest.cc",
|
||||
"../browser/browser_associated_interface_unittest.cc",
|
||||
"../browser/browser_main_loop_unittest.cc",
|
||||
"../browser/browser_thread_unittest.cc",
|
||||
"../browser/browser_url_handler_impl_unittest.cc",
|
||||
|
|
@ -2366,7 +2364,8 @@ test("content_unittests") {
|
|||
"../browser/client_hints/client_hints_unittest.cc",
|
||||
"../browser/code_cache/generated_code_cache_unittest.cc",
|
||||
"../browser/code_cache/simple_lru_cache_unittest.cc",
|
||||
"../browser/compute_pressure/compute_pressure_unittest.cc",
|
||||
"../browser/compute_pressure/pressure_service_for_frame_unittest.cc",
|
||||
"../browser/compute_pressure/pressure_service_for_worker_unittest.cc",
|
||||
"../browser/content_index/content_index_database_unittest.cc",
|
||||
"../browser/content_index/content_index_service_impl_unittest.cc",
|
||||
"../browser/cookie_deprecation_label/cookie_deprecation_label_manager_impl_unittest.cc",
|
||||
|
|
@ -2470,6 +2469,7 @@ test("content_unittests") {
|
|||
"../browser/interest_group/test_interest_group_private_aggregation_manager.h",
|
||||
"../browser/loader/cors_origin_pattern_setter_unittest.cc",
|
||||
"../browser/loader/file_url_loader_factory_unittest.cc",
|
||||
"../browser/loader/keep_alive_attribution_request_helper_unittest.cc",
|
||||
"../browser/loader/keep_alive_url_loader_service_unittest.cc",
|
||||
"../browser/loader/merkle_integrity_source_stream_unittest.cc",
|
||||
"../browser/loader/navigation_early_hints_manager_unittest.cc",
|
||||
|
|
@ -2522,6 +2522,7 @@ test("content_unittests") {
|
|||
"../browser/payments/payment_app_content_unittest_base.h",
|
||||
"../browser/payments/payment_app_provider_impl_unittest.cc",
|
||||
"../browser/payments/payment_manager_unittest.cc",
|
||||
"../browser/permissions/embedded_permission_control_checker_unittest.cc",
|
||||
"../browser/permissions/permission_controller_impl_unittest.cc",
|
||||
"../browser/permissions/permission_service_context_unittest.cc",
|
||||
"../browser/permissions/permission_util_unittest.cc",
|
||||
|
|
@ -2565,6 +2566,7 @@ test("content_unittests") {
|
|||
"../browser/renderer_host/ancestor_throttle_unittest.cc",
|
||||
"../browser/renderer_host/back_forward_cache_impl_unittest.cc",
|
||||
"../browser/renderer_host/back_forward_cache_metrics_unittest.cc",
|
||||
"../browser/renderer_host/back_forward_cache_subframe_navigation_throttle_unittest.cc",
|
||||
"../browser/renderer_host/browsing_context_group_swap_unittest.cc",
|
||||
"../browser/renderer_host/clipboard_host_impl_unittest.cc",
|
||||
"../browser/renderer_host/commit_deferring_condition_runner_unittest.cc",
|
||||
|
|
@ -2582,13 +2584,9 @@ test("content_unittests") {
|
|||
"../browser/renderer_host/input/mock_input_router_client.cc",
|
||||
"../browser/renderer_host/input/mock_input_router_client.h",
|
||||
"../browser/renderer_host/input/motion_event_web_unittest.cc",
|
||||
"../browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc",
|
||||
"../browser/renderer_host/input/passthrough_touch_event_queue_unittest.cc",
|
||||
"../browser/renderer_host/input/render_widget_host_latency_tracker_unittest.cc",
|
||||
"../browser/renderer_host/input/stylus_text_selector_unittest.cc",
|
||||
"../browser/renderer_host/input/touch_action_filter_unittest.cc",
|
||||
"../browser/renderer_host/input/touch_emulator_unittest.cc",
|
||||
"../browser/renderer_host/input/touchpad_pinch_event_queue_unittest.cc",
|
||||
"../browser/renderer_host/input/web_input_event_util_unittest.cc",
|
||||
"../browser/renderer_host/isolated_web_app_throttle_unittest.cc",
|
||||
"../browser/renderer_host/media/audio_input_device_manager_unittest.cc",
|
||||
|
|
@ -2751,7 +2749,6 @@ test("content_unittests") {
|
|||
"../browser/webui/web_ui_message_handler_unittest.cc",
|
||||
"../browser/webui/web_ui_unittest.cc",
|
||||
"../browser/webui/web_ui_url_loader_factory_unittest.cc",
|
||||
"../browser/webui/web_ui_webui_js_bridge_unittest.cc",
|
||||
"../browser/webui/webui_config_map_unittest.cc",
|
||||
"../browser/worker_host/dedicated_worker_service_impl_unittest.cc",
|
||||
"../browser/worker_host/mock_shared_worker.cc",
|
||||
|
|
@ -2780,12 +2777,17 @@ test("content_unittests") {
|
|||
"../common/input/fling_controller_unittest.cc",
|
||||
"../common/input/gesture_event_queue_unittest.cc",
|
||||
"../common/input/gesture_event_stream_validator_unittest.cc",
|
||||
"../common/input/mouse_wheel_event_queue_unittest.cc",
|
||||
"../common/input/passthrough_touch_event_queue_unittest.cc",
|
||||
"../common/input/synthetic_gesture_controller_unittest.cc",
|
||||
"../common/input/synthetic_pointer_action_unittest.cc",
|
||||
"../common/input/tap_suppression_controller_unittest.cc",
|
||||
"../common/input/touch_action_filter_unittest.cc",
|
||||
"../common/input/touch_event_stream_validator_unittest.cc",
|
||||
"../common/input/touchpad_pinch_event_queue_unittest.cc",
|
||||
"../common/pseudonymization_salt_unittest.cc",
|
||||
"../common/service_worker/race_network_request_url_loader_client_unittest.cc",
|
||||
"../common/service_worker/race_network_request_write_buffer_manager_unittest.cc",
|
||||
"../common/service_worker/service_worker_router_evaluator_unittest.cc",
|
||||
"../common/url_utils_unittest.cc",
|
||||
"../common/user_agent_unittest.cc",
|
||||
|
|
@ -2822,9 +2824,7 @@ test("content_unittests") {
|
|||
"../browser/cocoa/system_hotkey_map_unittest.mm",
|
||||
"../browser/media/capture/screen_capture_kit_fullscreen_module_unittest.mm",
|
||||
"../browser/renderer_host/input/mouse_wheel_rails_filter_unittest_mac.cc",
|
||||
"../browser/renderer_host/input/web_input_event_builders_mac_unittest.mm",
|
||||
"../browser/renderer_host/media/video_capture_devices_changed_observer_unittest.cc",
|
||||
"../browser/renderer_host/native_web_keyboard_event_mac_unittest.mm",
|
||||
"../browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm",
|
||||
"../browser/renderer_host/render_widget_host_view_mac_unittest.mm",
|
||||
"../browser/renderer_host/text_input_client_mac_unittest.mm",
|
||||
|
|
@ -2832,7 +2832,9 @@ test("content_unittests") {
|
|||
"../browser/speech/tts_mac_unittest.mm",
|
||||
"../browser/web_contents/web_drag_dest_mac_unittest.mm",
|
||||
"../browser/web_contents/web_drag_source_mac_unittest.mm",
|
||||
"../common/input/web_input_event_builders_mac_unittest.mm",
|
||||
"../common/mac/attributed_string_type_converters_unittest.mm",
|
||||
"../common/native_web_keyboard_event_mac_unittest.mm",
|
||||
"../renderer/sandbox_mac_v2_unittest.mm",
|
||||
]
|
||||
}
|
||||
|
|
@ -2878,10 +2880,12 @@ test("content_unittests") {
|
|||
"../browser/attribution_reporting/attribution_input_event_tracker_android_unittest.cc",
|
||||
"../browser/attribution_reporting/attribution_os_level_manager_android_unittest.cc",
|
||||
"../browser/display_cutout/display_cutout_host_impl_unittest.cc",
|
||||
"../browser/renderer_host/input/web_input_event_builders_android_unittest.cc",
|
||||
"../browser/display_cutout/safe_area_insets_host_impl_unittest.cc",
|
||||
"../browser/navigation_transitions/physics_model_unittest.cc",
|
||||
"../browser/web_contents/color_chooser_unittest.cc",
|
||||
"../common/android/cpu_time_metrics_unittest.cc",
|
||||
"../common/android/gin_java_bridge_value_unittest.cc",
|
||||
"../common/input/web_input_event_builders_android_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -2908,6 +2912,7 @@ test("content_unittests") {
|
|||
":content_test_bundle_data",
|
||||
":content_test_perfetto_bundle_data",
|
||||
"//media/test:media_bundle_data",
|
||||
"//testing/buildbot/filters:content_unittests_filters_bundle_data",
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -2936,6 +2941,8 @@ test("content_unittests") {
|
|||
"//components/network_session_configurator/common",
|
||||
"//components/offline_pages/buildflags",
|
||||
"//components/payments/mojom",
|
||||
"//components/permissions:permissions_common",
|
||||
"//components/permissions:test_support",
|
||||
"//components/services/quarantine/public/mojom",
|
||||
"//components/services/storage",
|
||||
"//components/services/storage:filesystem_proxy_factory",
|
||||
|
|
@ -2976,9 +2983,6 @@ test("content_unittests") {
|
|||
"//content/renderer:for_content_tests",
|
||||
"//content/services/auction_worklet:tests",
|
||||
"//content/services/auction_worklet/public/mojom:for_content_tests",
|
||||
"//content/test/web_ui:test_secondary_interface",
|
||||
"//content/test/web_ui:test_webui_js_bridge2_webui_js_bridge_impl",
|
||||
"//content/test/web_ui:test_webui_js_bridge_webui_js_bridge_impl",
|
||||
"//crypto",
|
||||
"//device/bluetooth",
|
||||
"//device/bluetooth:mocks",
|
||||
|
|
@ -3073,7 +3077,7 @@ test("content_unittests") {
|
|||
"//ui/webui:test_support",
|
||||
]
|
||||
|
||||
if (enable_nocompile_tests_new) {
|
||||
if (enable_nocompile_tests) {
|
||||
deps += [ ":content_nocompile_tests" ]
|
||||
}
|
||||
|
||||
|
|
@ -3166,7 +3170,7 @@ test("content_unittests") {
|
|||
"../browser/media/capture/web_contents_frame_tracker_unittest.cc",
|
||||
]
|
||||
|
||||
if (!is_android) {
|
||||
if (!is_android && !is_ios) {
|
||||
deps += [
|
||||
"//content/common:buildflags",
|
||||
"//media/capture:test_support",
|
||||
|
|
@ -3175,6 +3179,8 @@ test("content_unittests") {
|
|||
]
|
||||
sources += [
|
||||
"../browser/media/capture/desktop_capture_device_unittest.cc",
|
||||
"../browser/media/captured_surface_controller_permission_manager_unittest.cc",
|
||||
"../browser/media/captured_surface_controller_unittest.cc",
|
||||
"../browser/renderer_host/media/sub_capture_target_id_web_contents_helper_unittest.cc",
|
||||
]
|
||||
}
|
||||
|
|
@ -3272,7 +3278,7 @@ test("content_unittests") {
|
|||
deps += [
|
||||
":content_unittests_java",
|
||||
":content_unittests_jni_headers",
|
||||
"//base:base_java_unittest_support",
|
||||
"//base:base_unittest_support_java",
|
||||
"//build/config/freetype",
|
||||
"//cc/slim",
|
||||
"//components/download/internal/common:internal_java",
|
||||
|
|
@ -3407,7 +3413,7 @@ if (is_apple) {
|
|||
}
|
||||
}
|
||||
|
||||
if (enable_nocompile_tests_new) {
|
||||
if (enable_nocompile_tests) {
|
||||
nocompile_source_set("content_nocompile_tests") {
|
||||
sources = [ "../browser/browser_task_traits_nocompile.nc" ]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue