diff --git a/arm/android/chromium_android_args.gn b/arm/android/chromium_android_args.gn index e8ef9b00..6b43d340 100644 --- a/arm/android/chromium_android_args.gn +++ b/arm/android/chromium_android_args.gn @@ -1,6 +1,6 @@ -google_api_key = "AIzaSyBOti4mM-6x9WDnZIjIeyEU21OpBXqWBgw" -google_default_client_id = "77185425430.apps.googleusercontent.com" -google_default_client_secret = "OTJgUOQcT7lO7GsGZq2G4IlT" +google_api_key = "" +google_default_client_id = "" +google_default_client_secret = "" target_os = "android" target_cpu = "x64" v8_target_cpu = "x64" diff --git a/infra/PATCHES.md b/infra/PATCHES.md index 3b0bd660..daee26ec 100644 --- a/infra/PATCHES.md +++ b/infra/PATCHES.md @@ -29,7 +29,7 @@ V8 Font Rendering Patch > https://github.com/saiarcot895/chromium-ubuntu-build/b VAAPI Patch > https://github.com/saiarcot895/chromium-ubuntu-build/blob/master/debian/patches/enable-vaapi-on-linux.diff - Modified by me. -~~ VAAPI on Wayland Patch > https://github.com/ungoogled-software/ungoogled-chromium-archlinux/blob/master/ozone-add-va-api-support-to-wayland.patch ~~ REMOVED + REMOVED ~~VAAPI on Wayland Patch > https://github.com/ungoogled-software/ungoogled-chromium-archlinux/blob/master/ozone-add-va-api-support-to-wayland.patch~~ - From Arch AUR ~~ Use default search icon instead of search engine icon in omnibox patch > https://github.com/ungoogled-software/contrib/blob/master/tweaks/visual/default-search-icon.patch @@ -175,7 +175,7 @@ Enable double click to close tab flag - https://github.com/bigfoxtail/brave-core - Found by @gz83, modified by me. Enable close confirmation patch - https://github.com/ungoogled-software/ungoogled-chromium/blob/master/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch - - Modfied by me. + - Modified by me. CFI Ignores Patch - https://github.com/RobRich999/Chromium_Clang/blob/150e755bdb3f2c389ab3d485f38d62a36414e73a/Linux/linux64-avx.patch#L386 - Made by RobRich999 diff --git a/infra/THORIUM_DEV_BOOKMARKS.html b/infra/THORIUM_DEV_BOOKMARKS.html index 3ac30d14..9e66f2f0 100644 --- a/infra/THORIUM_DEV_BOOKMARKS.html +++ b/infra/THORIUM_DEV_BOOKMARKS.html @@ -216,7 +216,7 @@
browser_root_view.cc - Chromium Code Search

Chromium Code Search -
overlay-amd64-generic - Chromium Code Search +
overlay-amd64-generic - Chromium Code Search
Chromium Dash
GitHubStat v2

diff --git a/src/BUILD.gn b/src/BUILD.gn index 6f398c84..9877d0d2 100644 --- a/src/BUILD.gn +++ b/src/BUILD.gn @@ -282,7 +282,7 @@ group("gn_all") { deps += root_extra_deps - if (enable_printing) { + if (enable_printing || enable_printing_unittests) { deps += [ "//printing:printing_unittests" ] } @@ -637,7 +637,6 @@ group("gn_all") { if (is_win) { deps += [ "//base:pe_image_test", - "//chrome/chrome_cleaner", "//chrome/chrome_elf:chrome_elf_unittests", "//chrome/chrome_elf:dll_hash_main", "//chrome/elevation_service:elevation_service_unittests", @@ -862,8 +861,8 @@ group("all_rust") { # cross-compiling. if (enable_rust_gnrt && host_os == target_os && host_cpu == target_cpu) { deps += [ - "//tools/crates/gnrt:gnrt_unittests", "//tools/crates/gnrt($host_toolchain)", + "//tools/crates/gnrt/lib:gnrt_unittests", ] } } @@ -891,10 +890,6 @@ if (enable_remoting && ((is_linux && ozone_platform_x11) || "//remoting/host:host", "//tools/traffic_annotation:annotations_xml", ] - - if (is_win) { - deps += [ "//chrome/chrome_cleaner:shipped_binaries" ] - } } } @@ -1041,7 +1036,10 @@ if (is_chromeos_ash) { ] } if (use_v4l2_codec) { - data_deps += [ "//media/gpu/v4l2:v4l2_stateless_decoder" ] + data_deps += [ + "//media/gpu/v4l2:v4l2_stateless_decoder", + "//media/gpu/v4l2:v4l2_unittest", + ] } } } @@ -1212,9 +1210,9 @@ if (!is_ios && !is_cronet_build) { if (is_fuchsia) { data_deps += [ "//build/config/fuchsia:deployment_resources", - "//content/shell:thorium_shell_fuchsia", - "//content/shell:thorium_shell_pkg__archive-manifest", - "//content/shell:thorium_shell_pkg__archive-metadata", + "//content/shell:content_shell_fuchsia", + "//content/shell:content_shell_pkg__archive-manifest", + "//content/shell:content_shell_pkg__archive-metadata", ] } @@ -1632,10 +1630,11 @@ if (!is_ios && !is_cronet_build) { "//third_party/catapult/devil/", "//third_party/catapult/dependency_manager/", "//third_party/catapult/third_party/typ/", - "//third_party/depot_tools/pylint-1.5", + "//third_party/depot_tools/pylint-2.7", "//third_party/depot_tools/pylint_main.py", "//third_party/depot_tools/pylintrc", "//third_party/ply/", + "//third_party/pyjson5/", "//third_party/wpt_tools/", "//tools/idl_parser/", ] @@ -1768,6 +1767,7 @@ if (is_chromeos_ash && enable_js_type_check) { "chrome/browser/resources:closure_compile", "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", ] } diff --git a/src/chrome/BUILD.gn b/src/chrome/BUILD.gn index a066da32..5246319f 100644 --- a/src/chrome/BUILD.gn +++ b/src/chrome/BUILD.gn @@ -72,6 +72,15 @@ if (is_win && enable_resource_allowlist_generation) { _chrome_resource_allowlist = "$target_gen_dir/chrome_resource_allowlist.txt" } +# Thorium target that simply pulls in the chrome target as a dependency +group("thorium") { + deps = [ ":chrome" ] + + if (is_win) { + deps += [ ":chrome_dll" ] + } +} + if (is_win) { action("reorder_imports") { script = "//build/win/reorder-imports.py" diff --git a/src/chrome/app/app_management_strings.grdp b/src/chrome/app/app_management_strings.grdp index 8ce8681f..f6b57f9f 100644 --- a/src/chrome/app/app_management_strings.grdp +++ b/src/chrome/app/app_management_strings.grdp @@ -1,6 +1,5 @@ - Camera @@ -60,7 +59,7 @@ Opening <a href="#">supported links</a> - Open in $1Chrome browser + Open in $1Thorium browser Open in Thorium browser @@ -113,7 +112,7 @@ Android App - + Thorium App @@ -122,16 +121,16 @@ System App - + ThoriumOS System App - + Thorium Web Store Google Play Store - + Web App installed from Thorium browser @@ -152,6 +151,18 @@ Manage permissions and settings + + Ask every time + + + Allowed + + + Allowed – $1While in use + + + Denied + @@ -168,7 +179,7 @@ - + You can open and edit supported files with this app from the Files app or other apps. To control which files open this app by default, <a href="#">learn how to set default apps on your device</a>. diff --git a/src/chrome/browser/ui/webui/about_ui.cc b/src/chrome/browser/ui/webui/about_ui.cc index cd763760..408f1784 100644 --- a/src/chrome/browser/ui/webui/about_ui.cc +++ b/src/chrome/browser/ui/webui/about_ui.cc @@ -61,7 +61,6 @@ #include #include "base/base64.h" -#include "base/cxx17_backports.h" #include "base/strings/strcat.h" #include "chrome/browser/ash/borealis/borealis_credits.h" #include "chrome/browser/ash/crosapi/browser_manager.h" @@ -78,6 +77,7 @@ #include "chromeos/ash/components/system/statistics_provider.h" #include "components/language/core/common/locale_util.h" #include "third_party/cros_system_api/dbus/service_constants.h" +#include "third_party/zlib/google/compression_utils.h" #endif #if BUILDFLAG(IS_CHROMEOS_LACROS) #include "chrome/browser/lacros/lacros_url_handling.h" @@ -283,10 +283,12 @@ class ChromeOSCreditsHandler ChromeOSCreditsHandler(const ChromeOSCreditsHandler&) = delete; ChromeOSCreditsHandler& operator=(const ChromeOSCreditsHandler&) = delete; + // |prefix| allows tests to specify different location for the credits files. static void Start(const std::string& path, - content::URLDataSource::GotDataCallback callback) { + content::URLDataSource::GotDataCallback callback, + const base::FilePath& prefix) { scoped_refptr handler( - new ChromeOSCreditsHandler(path, std::move(callback))); + new ChromeOSCreditsHandler(path, std::move(callback), prefix)); handler->StartOnUIThread(); } @@ -294,8 +296,9 @@ class ChromeOSCreditsHandler friend class base::RefCountedThreadSafe; ChromeOSCreditsHandler(const std::string& path, - content::URLDataSource::GotDataCallback callback) - : path_(path), callback_(std::move(callback)) {} + content::URLDataSource::GotDataCallback callback, + const base::FilePath& prefix) + : path_(path), callback_(std::move(callback)), prefix_(prefix) {} virtual ~ChromeOSCreditsHandler() {} @@ -308,12 +311,38 @@ class ChromeOSCreditsHandler base::BindOnce(&ChromeOSCreditsHandler::ResponseOnUIThread, this)); } + // LoadCreditsFileAsync first attempts to load the uncompressed credits file. + // Then, if that's not present, it attempts to load and decompress the + // compressed credits file. + // If both fails, fall back to default contents as handled in + // ResponseOnUIThread. void LoadCreditsFileAsync() { - base::FilePath credits_file_path(chrome::kChromeOSCreditsPath); - if (!base::ReadFileToString(credits_file_path, &contents_)) { + if (prefix_.empty()) { + prefix_ = base::FilePath(chrome::kChromeOSCreditsPath).DirName(); + } + base::FilePath credits = + prefix_.Append(base::FilePath(chrome::kChromeOSCreditsPath).BaseName()); + if (base::ReadFileToString(credits, &contents_)) { + // Decompressed present; return. + return; + } + + // Decompressed not present; load compressed. + base::FilePath compressed_credits = prefix_.Append( + base::FilePath(chrome::kChromeOSCreditsCompressedPath).BaseName()); + std::string compressed; + if (!base::ReadFileToString(compressed_credits, &compressed)) { // File with credits not found, ResponseOnUIThread will load credits // from resources if contents_ is empty. contents_.clear(); + return; + } + + // Decompress. + if (!compression::GzipUncompress(compressed, &contents_)) { + LOG(DFATAL) << "Decompressing os credits failed"; + contents_.clear(); + return; } } @@ -337,6 +366,9 @@ class ChromeOSCreditsHandler // Chrome OS credits contents that was loaded from file. std::string contents_; + + // Directory containing files to read. + base::FilePath prefix_; }; void OnBorealisCreditsLoaded(content::URLDataSource::GotDataCallback callback, @@ -669,7 +701,8 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString( IDR_ABOUT_UI_CREDITS_CSS); } else { - ChromeOSCreditsHandler::Start(path, std::move(callback)); + ChromeOSCreditsHandler::Start(path, std::move(callback), + os_credits_prefix_); return; } } else if (source_name_ == chrome::kChromeUICrostiniCreditsHost) { diff --git a/src/components/autofill_payments_strings.grdp b/src/components/autofill_payments_strings.grdp index a7220995..84bf185b 100644 --- a/src/components/autofill_payments_strings.grdp +++ b/src/components/autofill_payments_strings.grdp @@ -457,13 +457,13 @@ - + verify it's you so it can fill in your payment info. - Google Thorium is trying to verify it's you so it can fill in your payment info. + Thorium is trying to verify it's you so it can fill in your payment info. diff --git a/src/components/components_chromium_strings.grd b/src/components/components_chromium_strings.grd index 832252bc..6d1324c5 100644 --- a/src/components/components_chromium_strings.grd +++ b/src/components/components_chromium_strings.grd @@ -282,12 +282,12 @@ - Thorium is made possible by the <a target="_blank" href="$1">Thorium</a> open source project and other <a target="_blank" href="$2">open source software</a>. + Thorium is made possible by the <a target="_blank" href="$1">Chromium</a> open source project and other <a target="_blank" href="$2">open source software</a>. - - Thorium is made possible by the <a target="_blank" href="$1">Thorium</a> open source project. + + Thorium is made possible by the <a target="_blank" href="$1">Chromium</a> open source project. diff --git a/src/components/error_page_strings.grdp b/src/components/error_page_strings.grdp index 48273761..c1833da5 100644 --- a/src/components/error_page_strings.grdp +++ b/src/components/error_page_strings.grdp @@ -55,6 +55,7 @@ Check any cables and reboot any routers, modems, or other network + devices you may be using. Also check that any proxy server currently in use is reachable and configured correctly. devices you may be using. @@ -381,7 +382,7 @@ - Tap the dino to play + Tap the Dino to play Dino game. A pixelated dinosaur dodges cacti and pterodactyls as it runs across a desolate landscape. When you hear an audio cue, tap to jump over obstacles. @@ -389,7 +390,7 @@ - Press space to play + Press Space or the Up Arrow to Play Dino game. A pixelated dinosaur dodges cacti and pterodactyls as it runs across a desolate landscape. When you hear an audio cue, press space to jump over obstacles. @@ -411,6 +412,6 @@ Jump! - Start slower + Start slower? diff --git a/src/components/flags_ui/resources/flags.css b/src/components/flags_ui/resources/flags.css index 208d4ebc..98982bbb 100644 --- a/src/components/flags_ui/resources/flags.css +++ b/src/components/flags_ui/resources/flags.css @@ -131,6 +131,15 @@ button { outline: none; } +@media (forced-colors: active) { + :focus-visible { + /* Outline is needed for Windows HCM. Color of outline does not matter; it + * is overridden by the OS. */ + box-shadow: none; + outline: 2px solid transparent; + } +} + @media (prefers-color-scheme: dark) { #flagsTemplate { background: rgba(255, 255, 255, .04); diff --git a/src/components/page_info_strings.grdp b/src/components/page_info_strings.grdp index 29d62281..f4b4b2d3 100644 --- a/src/components/page_info_strings.grdp +++ b/src/components/page_info_strings.grdp @@ -661,7 +661,7 @@ Go to permission settings - Allow on every visit + Remember this setting {NUM_PERMISSIONS, plural, =1 {Reset permission} other {Reset permissions}} diff --git a/src/content/shell/BUILD.gn b/src/content/shell/BUILD.gn index 7fc6e128..4202babe 100644 --- a/src/content/shell/BUILD.gn +++ b/src/content/shell/BUILD.gn @@ -40,7 +40,7 @@ shell_use_toolkit_views = toolkit_views && !is_castos declare_args() { content_shell_product_name = "Thorium Shell" - content_shell_version = "999.77.34.5" + content_shell_version = "999.0.3434.555" content_shell_major_version = "999" } @@ -213,8 +213,19 @@ static_library("content_shell_lib") { if (is_ios) { sources += [ + "browser/bluetooth/ios/shell_bluetooth_chooser_coordinator.h", + "browser/bluetooth/ios/shell_bluetooth_chooser_coordinator.mm", + "browser/bluetooth/ios/shell_bluetooth_chooser_ios.h", + "browser/bluetooth/ios/shell_bluetooth_chooser_ios.mm", + "browser/bluetooth/ios/shell_bluetooth_chooser_mediator.h", + "browser/bluetooth/ios/shell_bluetooth_chooser_mediator.mm", + "browser/bluetooth/ios/shell_bluetooth_device_list_consumer.h", + "browser/bluetooth/ios/shell_bluetooth_device_list_delegate.h", + "browser/bluetooth/ios/shell_bluetooth_device_list_view_controller.h", + "browser/bluetooth/ios/shell_bluetooth_device_list_view_controller.mm", "browser/bluetooth/shell_bluetooth_delegate_impl_client.cc", "browser/bluetooth/shell_bluetooth_delegate_impl_client.h", + "browser/shell_browser_main_parts_ios.mm", "browser/shell_file_select_helper.cc", "browser/shell_file_select_helper.h", "browser/shell_platform_delegate_ios.mm", @@ -287,7 +298,6 @@ static_library("content_shell_lib") { "//components/variations/service", "//components/web_cache/renderer", "//content:content_resources", - "//content:dev_ui_content_resources", "//content/common:main_frame_counter", "//content/public/common", "//content/test:content_test_mojo_bindings", @@ -363,6 +373,7 @@ static_library("content_shell_lib") { if (is_ios) { deps += [ "//components/permissions", + "//components/strings:components_strings", "//services/tracing/public/cpp", "//services/tracing/public/mojom:mojom", "//ui/shell_dialogs", @@ -478,10 +489,11 @@ repack("pak") { "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak", "$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak", "$root_gen_dir/content/content_resources.pak", - "$root_gen_dir/content/dev_ui_content_resources.pak", "$root_gen_dir/content/gpu_resources.pak", "$root_gen_dir/content/histograms_resources.pak", + "$root_gen_dir/content/process_resources.pak", "$root_gen_dir/content/quota_internals_resources.pak", + "$root_gen_dir/content/service_worker_resources.pak", "$root_gen_dir/content/shell/shell_resources.pak", "$root_gen_dir/content/test/web_ui_mojo_test_resources.pak", "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak", @@ -502,7 +514,6 @@ repack("pak") { ":resources", "//base/tracing/protos:chrome_track_event_resources", "//content:content_resources", - "//content:dev_ui_content_resources", "//content/browser/resources:resources", "//content/browser/resources/media:resources", "//content/browser/webrtc/resources", @@ -523,6 +534,17 @@ repack("pak") { sources += [ "$root_gen_dir/content/browser/tracing/tracing_resources.pak" ] } + if (is_ios) { + sources += [ + "$root_gen_dir/device/bluetooth/strings/bluetooth_strings_en-US.pak", + "${root_gen_dir}/components/strings/components_strings_en-US.pak", + ] + deps += [ + "//components/strings:components_strings", + "//device/bluetooth/strings/", + ] + } + if (shell_use_toolkit_views) { deps += [ "//ui/views/resources" ] sources += @@ -537,7 +559,7 @@ repack("pak") { } if (is_android) { - group("thorium_shell") { + group("content_shell") { testonly = true deps = [ "//content/shell/android:content_shell_apk" ] } @@ -593,7 +615,7 @@ if (is_android) { "//build/config/ios/entitlements.plist" } - ios_app_bundle("thorium_shell") { + ios_app_bundle("content_shell") { info_plist = "app/ios-Info.plist" testonly = true @@ -670,24 +692,24 @@ if (is_android) { fuchsia_component("content_shell_component") { testonly = true manifest = "fuchsia/content_shell.cml" - data_deps = [ ":thorium_shell" ] + data_deps = [ ":content_shell" ] visibility = [ ":*" ] } - fuchsia_package("thorium_shell_pkg") { + fuchsia_package("content_shell_pkg") { testonly = true - package_name = "thorium_shell" + package_name = "content_shell" deps = [ ":content_shell_component" ] } - fuchsia_package_installer("thorium_shell_fuchsia") { + fuchsia_package_installer("content_shell_fuchsia") { testonly = true visibility = [ ":*", # See https://crbug.com/1328459#c4. "//:*", ] - package = ":thorium_shell_pkg" - package_name = "thorium_shell" + package = ":content_shell_pkg" + package_name = "content_shell" } } } diff --git a/src/content/shell/app/shell.rc b/src/content/shell/app/shell.rc index c658e8d3..bd5d58b6 100644 --- a/src/content/shell/app/shell.rc +++ b/src/content/shell/app/shell.rc @@ -44,6 +44,7 @@ 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" #ifdef APSTUDIO_INVOKED diff --git a/src/content/test/BUILD.gn b/src/content/test/BUILD.gn index 4bcecd46..5f22d559 100644 --- a/src/content/test/BUILD.gn +++ b/src/content/test/BUILD.gn @@ -577,7 +577,6 @@ static_library("test_support") { "//ui/accessibility:ax_enums_mojo", "//ui/base", "//ui/base:test_support", - "//ui/base:ui_data_pack", "//ui/base/clipboard", "//ui/base/clipboard:clipboard_test_support", "//ui/base/ime", @@ -975,11 +974,11 @@ static_library("browsertest_support") { "../public/test/content_browser_test_utils.h", "../public/test/content_cert_verifier_browser_test.cc", "../public/test/content_cert_verifier_browser_test.h", + "../public/test/resource_load_observer.cc", + "../public/test/resource_load_observer.h", "content_browser_test_utils_internal.cc", "content_browser_test_utils_internal.h", "content_test_launcher.cc", - "resource_load_observer.cc", - "resource_load_observer.h", ] public_deps = [ @@ -1268,6 +1267,7 @@ test("content_browsertests") { "../browser/attribution_reporting/attribution_internals_browsertest.cc", "../browser/attribution_reporting/attribution_src_browsertest.cc", "../browser/attribution_reporting/attributions_browsertest.cc", + "../browser/attribution_reporting/cross_app_web_attribution_browsertest.cc", "../browser/attribution_reporting/privacy_sandbox_ads_apis_browsertest.cc", "../browser/attribution_reporting/source_declaration_browsertest.cc", "../browser/attribution_reporting/trigger_registration_browsertest.cc", @@ -1296,6 +1296,7 @@ test("content_browsertests") { "../browser/browsing_topics/browsing_topics_browsertest.cc", "../browser/child_process_launcher_browsertest.cc", "../browser/child_process_security_policy_browsertest.cc", + "../browser/compute_pressure/compute_pressure_origin_trial_browsertest.cc", "../browser/content_index/content_index_browsertest.cc", "../browser/content_security_policy_browsertest.cc", "../browser/cross_origin_opener_policy_browsertest.cc", @@ -1391,6 +1392,7 @@ test("content_browsertests") { "../browser/network/sandboxed_http_cache_browsertest.cc", "../browser/network/sandboxed_nqe_browsertest.cc", "../browser/network/sandboxed_socket_broker_browsertest.cc", + "../browser/network/shared_dictionary_browsertest.cc", "../browser/network/split_cache_browsertest.cc", "../browser/network/transferable_socket_browsertest.cc", "../browser/network/trust_token_browsertest.cc", @@ -1410,6 +1412,7 @@ test("content_browsertests") { "../browser/portal/portal_navigation_throttle_browsertest.cc", "../browser/power_monitor_browsertest.cc", "../browser/preloading/anchor_element_interaction_browsertest.cc", + "../browser/preloading/preloading_decider_browsertest.cc", "../browser/preloading/prerender/prerender_browsertest.cc", "../browser/process_internals/process_internals_browsertest.cc", "../browser/quota/quota_browsertest.cc", @@ -1523,8 +1526,12 @@ test("content_browsertests") { "../browser/web_contents/web_contents_view_aura_browsertest.cc", "../browser/web_package/signed_exchange_request_handler_browsertest.cc", "../browser/web_package/signed_exchange_subresource_prefetch_browsertest.cc", + "../browser/webid/test/mock_identity_request_dialog_controller.cc", + "../browser/webid/test/mock_identity_request_dialog_controller.h", "../browser/webid/test/mock_mdoc_provider.cc", "../browser/webid/test/mock_mdoc_provider.h", + "../browser/webid/test/mock_modal_dialog_view_delegate.cc", + "../browser/webid/test/mock_modal_dialog_view_delegate.h", "../browser/webid/test/webid_test_content_browser_client.cc", "../browser/webid/test/webid_test_content_browser_client.h", "../browser/webid/webid_browsertest.cc", @@ -1606,7 +1613,6 @@ test("content_browsertests") { ":test_interfaces", ":web_ui_mojo_test_resources", "//content:content_resources", - "//content:dev_ui_content_resources", ] deps = [ @@ -1736,10 +1742,17 @@ test("content_browsertests") { "//ui/webui:test_support", ] - data = [ - "data/", - "//media/test/data/", - ] + if (is_ios) { + bundle_deps = [ + ":content_test_bundle_data", + "//media/test:media_bundle_data", + ] + } else { + data = [ + "data/", + "//media/test/data/", + ] + } data_deps = [ "//content/shell:pak", @@ -1863,6 +1876,8 @@ test("content_browsertests") { "//third_party/isimpledom", ] + data_deps += [ "//services/test/echo:echo_preload_library" ] + libs = [ "uiautomationcore.lib" ] configs += [ "//build/config/win:delayloads" ] @@ -1961,7 +1976,9 @@ test("content_browsertests") { "//content/public/browser:proto", "//ui/base/clipboard:clipboard_test_support", ] - data += [ "//content/test/data/clipboard/" ] + if (!is_ios) { + data += [ "//content/test/data/clipboard/" ] + } } if (is_posix) { deps += [ "//services/tracing:test_utils" ] @@ -2013,7 +2030,7 @@ test("content_browsertests") { "../browser/keyboard_lock_browsertest_ios.mm", "../browser/pointer_lock_browsertest_ios.mm", ] - bundle_deps = [ ":content_shell_pak_bundle_data" ] + bundle_deps += [ ":content_shell_pak_bundle_data" ] } if (is_chromeos_ash) { @@ -2213,6 +2230,7 @@ test("content_unittests") { "../browser/attribution_reporting/attribution_storage_unittest.cc", "../browser/attribution_reporting/attribution_utils_unittest.cc", "../browser/attribution_reporting/combinatorics_unittest.cc", + "../browser/attribution_reporting/destination_throttler_unittest.cc", "../browser/attribution_reporting/rate_limit_table_unittest.cc", "../browser/background_fetch/background_fetch_cross_origin_filter_unittest.cc", "../browser/background_fetch/background_fetch_data_manager_unittest.cc", @@ -2251,7 +2269,7 @@ test("content_unittests") { "../browser/browsing_data/clear_site_data_handler_unittest.cc", "../browser/browsing_topics/browsing_topics_site_data_manager_impl_unittest.cc", "../browser/browsing_topics/browsing_topics_site_data_storage_unittest.cc", - "../browser/browsing_topics/browsing_topics_url_loader_service_unittest.cc", + "../browser/browsing_topics/browsing_topics_url_loader_unittest.cc", "../browser/browsing_topics/header_util_unittest.cc", "../browser/buckets/bucket_manager_host_unittest.cc", "../browser/buckets/bucket_utils_unittest.cc", @@ -2340,6 +2358,7 @@ test("content_unittests") { "../browser/indexed_db/mock_mojo_indexed_db_database_callbacks.cc", "../browser/indexed_db/mock_mojo_indexed_db_database_callbacks.h", "../browser/interest_group/ad_auction_service_impl_unittest.cc", + "../browser/interest_group/ad_auction_url_loader_interceptor_unittest.cc", "../browser/interest_group/auction_metrics_recorder_unittest.cc", "../browser/interest_group/auction_process_manager_unittest.cc", "../browser/interest_group/auction_runner_unittest.cc", @@ -2391,6 +2410,7 @@ test("content_unittests") { "../browser/media/system_media_controls_notifier_unittest.cc", "../browser/media/webaudio/audio_context_manager_impl_unittest.cc", "../browser/memory/swap_metrics_driver_impl_unittest.cc", + "../browser/metrics/histogram_shared_memory_config_unittest.cc", "../browser/metrics/histograms_monitor_unittest.cc", "../browser/mojo_binder_policy_applier_unittest.cc", "../browser/mojo_binder_policy_map_impl_unittest.cc", @@ -2511,6 +2531,7 @@ test("content_unittests") { "../browser/renderer_host/media/video_capture_controller_unittest.cc", "../browser/renderer_host/media/video_capture_manager_unittest.cc", "../browser/renderer_host/media/video_capture_unittest.cc", + "../browser/renderer_host/mixed_content_checker_unittest.cc", "../browser/renderer_host/mixed_content_navigation_throttle_unittest.cc", "../browser/renderer_host/navigation_controller_impl_unittest.cc", "../browser/renderer_host/navigation_entry_impl_unittest.cc", @@ -2610,6 +2631,7 @@ test("content_unittests") { "../browser/webid/federated_auth_request_impl_registry_unittest.cc", "../browser/webid/federated_auth_request_impl_unittest.cc", "../browser/webid/federated_auth_user_info_request_unittest.cc", + "../browser/webid/identity_registry_unittest.cc", "../browser/webid/idp_network_request_manager_unittest.cc", "../browser/webid/test/delegated_idp_network_request_manager.cc", "../browser/webid/test/delegated_idp_network_request_manager.h", @@ -2619,10 +2641,14 @@ test("content_unittests") { "../browser/webid/test/mock_api_permission_delegate.h", "../browser/webid/test/mock_auto_reauthn_permission_delegate.cc", "../browser/webid/test/mock_auto_reauthn_permission_delegate.h", + "../browser/webid/test/mock_identity_registry.cc", + "../browser/webid/test/mock_identity_registry.h", "../browser/webid/test/mock_identity_request_dialog_controller.cc", "../browser/webid/test/mock_identity_request_dialog_controller.h", "../browser/webid/test/mock_idp_network_request_manager.cc", "../browser/webid/test/mock_idp_network_request_manager.h", + "../browser/webid/test/mock_modal_dialog_view_delegate.cc", + "../browser/webid/test/mock_modal_dialog_view_delegate.h", "../browser/webid/test/mock_permission_delegate.cc", "../browser/webid/test/mock_permission_delegate.h", "../browser/webrtc/webrtc_internals_message_handler_unittest.cc", @@ -2634,6 +2660,7 @@ test("content_unittests") { "../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", "../browser/worker_host/mock_shared_worker.h", @@ -2766,17 +2793,14 @@ test("content_unittests") { if (is_ios) { bundle_deps = [ ":content_shell_pak_bundle_data", - ":content_unittests_bundle_data", + ":content_test_bundle_data", "//media/test:media_bundle_data", ] } configs += [ "//build/config:precompiled_headers" ] - public_deps = [ - "//content:content_resources", - "//content:dev_ui_content_resources", - ] + public_deps = [ "//content:content_resources" ] deps = [ ":content_test_mojo_bindings", @@ -2963,13 +2987,10 @@ test("content_unittests") { } if (is_fuchsia) { - deps += [ - "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.accessibility.semantics:fuchsia.accessibility.semantics_cpp", - "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.accessibility.semantics:fuchsia.accessibility.semantics_hlcpp", - ] + deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.accessibility.semantics:fuchsia.accessibility.semantics_cpp" ] } - if (enable_printing) { + if (enable_printing || enable_printing_unittests) { deps += [ "//printing", "//printing/backend", @@ -2989,7 +3010,6 @@ test("content_unittests") { "../renderer/pepper/event_conversion_unittest.cc", "../renderer/pepper/host_var_tracker_unittest.cc", "../renderer/pepper/mock_resource.h", - "../renderer/pepper/resource_creation_impl_unittest.cc", "../renderer/pepper/v8_var_converter_unittest.cc", ] deps += [ @@ -3136,6 +3156,7 @@ test("content_unittests") { sources += [ "../browser/devtools/protocol/webauthn_handler_unittest.cc", "../browser/host_zoom_map_impl_unittest.cc", + "../browser/picture_in_picture/document_picture_in_picture_navigation_throttle_unittest.cc", "../browser/serial/serial_unittest.cc", "../browser/speech/endpointer/endpointer_unittest.cc", "../browser/speech/speech_recognition_engine_unittest.cc", @@ -3238,9 +3259,9 @@ if (is_ios) { outputs = [ "{{bundle_resources_dir}}/content_shell.pak" ] } - bundle_data_from_filelist("content_unittests_bundle_data") { + bundle_data_from_filelist("content_test_bundle_data") { testonly = true - filelist_name = "content_unittests_bundle_data.filelist" + filelist_name = "content_test_bundle_data.filelist" } } @@ -3308,6 +3329,7 @@ group("gpu_pytype") { data = [ "//content/test/gpu/run_pytype.py", + "//content/test/gpu/unexpected_pass_finder.py", "//content/test/gpu/validate_tag_consistency.py", "//content/test/gpu/gold_inexact_matching/",