M116 stage 4

This commit is contained in:
Alexander Frick 2023-09-04 05:19:51 -05:00
parent a0ba4c0660
commit c6548d1dfb
9 changed files with 153 additions and 351 deletions

View File

@ -330,11 +330,14 @@ group("gn_all") {
deps += [
"//ui/aura:aura_demo",
"//ui/aura:aura_unittests",
"//ui/webui/examples:webui_examples",
"//ui/wm:wm_unittests",
]
}
if (use_aura || is_mac) {
deps += [ "//ui/webui/examples:webui_examples" ]
}
if (use_ozone) {
deps += [
"//ui/ozone",
@ -860,6 +863,9 @@ group("all_rust") {
deps = [ ":rust_build_tests" ]
if (toolchain_has_rust) {
# There is rust stuff behind flags in here.
deps += [ "//base:base_unittests" ]
if (enable_rust_mojo) {
deps += [
"//mojo/public/rust",
@ -867,15 +873,6 @@ group("all_rust") {
"//mojo/public/rust:mojo_rust_unittests",
]
}
# gnrt is a developer tool run on developer machines. It is not needed when
# cross-compiling.
if (enable_rust_gnrt && host_os == target_os && host_cpu == target_cpu) {
deps += [
"//tools/crates/gnrt($host_toolchain)",
"//tools/crates/gnrt/lib:gnrt_unittests",
]
}
}
if (enable_rust_gtest_interop) {
deps += [ "//testing/rust_gtest_interop:rust_gtest_interop_unittests" ]
@ -1026,7 +1023,7 @@ if (is_chromeos_ash) {
"//ui/ozone/gl:ozone_gl_unittests",
]
if (enable_plugins) {
if (enable_ppapi) {
data_deps += [ "//ppapi/examples/video_decode" ]
}
@ -1048,6 +1045,7 @@ if (is_chromeos_ash) {
}
if (use_v4l2_codec) {
data_deps += [
"//media/gpu/chromeos:image_processor_perf_test",
"//media/gpu/v4l2:v4l2_stateless_decoder",
"//media/gpu/v4l2:v4l2_unittest",
]
@ -1142,6 +1140,7 @@ if (!is_ios && !is_cronet_build) {
args = [
"--product=chrome",
"--no-show-results",
"--zero-tests-executed-ok",
]
data_deps = [
"//chrome:chrome",
@ -1151,7 +1150,10 @@ if (!is_ios && !is_cronet_build) {
}
script_test("wpt_tests_isolate_content_shell") {
script = "//third_party/blink/tools/run_wpt_tests.py"
args = [ "--no-show-results" ]
args = [
"--no-show-results",
"--zero-tests-executed-ok",
]
data_deps = [
":blink_web_tests_support_data",
"//third_party/blink/tools:wpt_tests_isolate",
@ -1243,6 +1245,7 @@ if (!is_ios && !is_cronet_build) {
if (is_win) {
data += [
"//third_party/apache-win32/",
"//third_party/apache-windows-arm64/",
"//third_party/perl/perl/",
]
data_deps += [ "//build/win:copy_cdb_to_output" ]
@ -1338,6 +1341,7 @@ if (!is_ios && !is_cronet_build) {
"//third_party/blink/web_tests/TestExpectations",
"//third_party/blink/web_tests/WebDriverExpectations",
"//third_party/blink/web_tests/WebGPUExpectations",
"//third_party/blink/web_tests/SmokeTests/SingleThreadedTests",
# === List Test Cases folders here ===
"//third_party/blink/web_tests/accessibility/",
@ -1430,6 +1434,7 @@ if (!is_ios && !is_cronet_build) {
data += [
"//third_party/blink/web_tests/platform/win/",
"//third_party/blink/web_tests/platform/win10/",
"//third_party/blink/web_tests/platform/win11-arm64/",
]
if (is_linux || is_fuchsia) {
data += [ "//third_party/blink/web_tests/platform/linux/" ]
@ -1478,6 +1483,7 @@ if (!is_ios && !is_cronet_build) {
data = [
"//third_party/blink/perf_tests/",
"//third_party/blink/web_tests/SmokeTests/Default.txt",
"//third_party/blink/web_tests/SmokeTests/rel-ready.blink_wpt_tests.filter",
"//third_party/blink/web_tests/VirtualTestSuites",
# List all test expectations here
@ -1490,6 +1496,7 @@ if (!is_ios && !is_cronet_build) {
"//third_party/blink/web_tests/TestExpectations",
"//third_party/blink/web_tests/WebDriverExpectations",
"//third_party/blink/web_tests/WebGPUExpectations",
"//third_party/blink/web_tests/SmokeTests/SingleThreadedTests",
# === List Test Cases folders here ===
"//third_party/blink/web_tests/external/",
@ -1637,6 +1644,7 @@ if (!is_ios && !is_cronet_build) {
"//third_party/blink/web_tests/TestExpectations",
"//third_party/blink/web_tests/VirtualTestSuites",
"//third_party/blink/web_tests/W3CImportExpectations",
"//third_party/blink/web_tests/SmokeTests/SingleThreadedTests",
"//third_party/catapult/common/py_utils/",
"//third_party/catapult/devil/",
"//third_party/catapult/dependency_manager/",

View File

@ -220,6 +220,7 @@ def dev_list():
"libelf-dev",
"libevdev-dev",
"libffi-dev",
"libfuse2",
"libgbm-dev",
"libglib2.0-dev",
"libglu1-mesa-dev",

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2023 Alex313031. -->
<grit-part>
<message name="IDS_APP_MANAGEMENT_CAMERA" desc="Label for the camera permission toggle.">
Camera
@ -109,6 +109,9 @@
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_TITLE" desc="Title for App Details Section">
App details
</message>
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_TOOLTIP_SYSTEM" desc="Text for System app tooltip">
This system app is preinstalled on your device
</message>
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_ANDROID" desc="Text for Android app type">
Android App
</message>
@ -148,8 +151,8 @@
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_DATA_SIZE" desc="Text for data size label for the amount of storage the app's associated files is using">
Data stored in app: <ph name="APP_SIZE">$1<ex>100 MB</ex></ph>
</message>
<message name="IDS_APP_MANAGEMENT_ARC_MANAGE_PERMISSIONS" desc="Label for a link to manage permissions and more settings for an app.">
Manage permissions and settings
<message name="IDS_APP_MANAGEMENT_ARC_MANAGE_PERMISSIONS" desc="Label for a link to manage permissions for an app.">
Manage permissions
</message>
<message name="IDS_APP_MANAGEMENT_PERMISSION_ASK" desc="Label explaining that the user will be asked whether an app can access a permission (e.g. camera access) every time it is used.">
Ask every time
@ -203,4 +206,7 @@
other {Supported file types: <ph name="FILE_TYPE1">{FILE_TYPE1}<ex>TXT</ex></ph>, <ph name="FILE_TYPE2">{FILE_TYPE2}<ex>CSV</ex></ph>, <ph name="FILE_TYPE3">{FILE_TYPE3}<ex>DOC</ex></ph>, <ph name="FILE_TYPE4">{FILE_TYPE4}<ex>DOCX</ex></ph> (<ph name="LINK">&lt;a href="{LINK}"&gt;</ph>and {OVERFLOW_COUNT} more<ph name="END_LINK">&lt;/a&gt;</ph>)}
}
</message>
<message name="IDS_APP_MANAGEMENT_SUB_APPS_LIST_HEADING" desc="Label for the sub-app section in an app's settings page. The section lists all sub-applications that got installed by the current app. These sub-applications might be installed locally, or streamed from a remote location via the parent app.">
Installed and streamed applications from <ph name="APP_NAME">$1<ex>Citrix</ex></ph>
</message>
</grit-part>

View File

@ -696,26 +696,31 @@ void AboutUIHTMLSource::StartDataRequest(
response = AboutLinuxProxyConfig();
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
} else if (source_name_ == chrome::kChromeUIOSCreditsHost) {
if (path == kCreditsCssPath) {
response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
IDR_ABOUT_UI_CREDITS_CSS);
} else {
ChromeOSCreditsHandler::Start(path, std::move(callback),
os_credits_prefix_);
} else if (source_name_ == chrome::kChromeUIOSCreditsHost ||
source_name_ == chrome::kChromeUICrostiniCreditsHost ||
source_name_ == chrome::kChromeUIBorealisCreditsHost) {
int idr = IDR_ABOUT_UI_CREDITS_HTML;
if (path == kCreditsJsPath) {
idr = IDR_ABOUT_UI_CREDITS_JS;
} else if (path == kCreditsCssPath) {
idr = IDR_ABOUT_UI_CREDITS_CSS;
}
if (idr == IDR_ABOUT_UI_CREDITS_HTML) {
if (source_name_ == chrome::kChromeUIOSCreditsHost) {
ChromeOSCreditsHandler::Start(path, std::move(callback),
os_credits_prefix_);
} else if (source_name_ == chrome::kChromeUICrostiniCreditsHost) {
CrostiniCreditsHandler::Start(profile(), path, std::move(callback));
} else if (source_name_ == chrome::kChromeUIBorealisCreditsHost) {
HandleBorealisCredits(profile(), std::move(callback));
} else {
NOTREACHED();
}
return;
}
} else if (source_name_ == chrome::kChromeUICrostiniCreditsHost) {
if (path == kCreditsCssPath) {
response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
IDR_ABOUT_UI_CREDITS_CSS);
} else {
CrostiniCreditsHandler::Start(profile(), path, std::move(callback));
return;
}
} else if (source_name_ == chrome::kChromeUIBorealisCreditsHost) {
HandleBorealisCredits(profile(), std::move(callback));
return;
response =
ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
#endif
#if !BUILDFLAG(IS_ANDROID)
} else if (source_name_ == chrome::kChromeUITermsHost) {
@ -777,7 +782,7 @@ std::string AboutUIHTMLSource::GetAccessControlAllowOriginForOrigin(
return content::URLDataSource::GetAccessControlAllowOriginForOrigin(origin);
}
AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name)
AboutUI::AboutUI(content::WebUI* web_ui, const std::string& host)
: WebUIController(web_ui) {
Profile* profile = Profile::FromWebUI(web_ui);
@ -787,7 +792,7 @@ AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name)
#endif
content::URLDataSource::Add(
profile, std::make_unique<AboutUIHTMLSource>(name, profile));
profile, std::make_unique<AboutUIHTMLSource>(host, profile));
}
#if BUILDFLAG(IS_CHROMEOS)

View File

@ -38,6 +38,9 @@ source_set("lib") {
"decompress.h",
"delete_with_retry.cc",
"delete_with_retry.h",
"enumerate_resources.cc",
"enumerate_resources.h",
"memory_range.h",
"mini_file.cc",
"mini_file.h",
"mini_installer.cc",
@ -49,10 +52,10 @@ source_set("lib") {
"mini_string.cc",
"mini_string.h",
"path_string.h",
"pe_resource.cc",
"pe_resource.h",
"regkey.cc",
"regkey.h",
"write_to_disk.cc",
"write_to_disk.h",
]
deps = [
@ -80,6 +83,7 @@ source_set("unit_tests") {
"mini_file_test.cc",
"mini_installer_unittest.cc",
"mini_string_test.cc",
"write_to_disk_unittest.cc",
]
public_deps = [ ":lib" ]

View File

@ -70,12 +70,9 @@ html {
body {
color: var(--primary-color);
display: flex;
flex-direction: column;
font-family: Roboto;
font-size: 0.8125em;
/* Force the vertical scrollbar to always be displayed, to avoid UI jumps. */
height: 100vh;
height: 100%;
margin: 0;
}
@ -122,8 +119,7 @@ button {
}
#flagsTemplate {
flex: 1;
padding: calc(60px + 1rem) var(--side-padding) 8px;
padding: 1rem var(--side-padding) 8px;
}
:focus-visible {
@ -164,9 +160,8 @@ button {
background: var(--toolbar-color);
box-shadow: 0 2px 2px 0 var(--shadow-color);
box-sizing: border-box;
flex: none;
left: 0;
position: fixed;
position: sticky;
top: 0;
width: 100%;
z-index: 9;
@ -302,139 +297,6 @@ button:not(.primary):hover {
}
}
.experiment {
color: var(--secondary-color);
line-height: 1.45;
/* Adjustment for fixed header */
margin: .3em 0 -70px;
padding-top: 70px;
width: 100%;
}
.experiment .flex-container {
padding: 0.8em 4px 16px 0;
}
.experiment .flex-container .flex:first-child {
box-sizing: border-box;
max-width: 540px;
padding-inline-end: 8px;
}
.experiment p {
margin: .2em 0;
}
.experiment-name {
color: var(--primary-color);
display: inline-block;
font-size: .8125rem;
font-weight: 500;
line-height: 1.5;
margin: 0;
padding: 0;
}
.experiment-switched .experiment-name::before {
--end-margin: 4px;
--width: 12px;
color: var(--interactive-color);
content: '•';
display: inline-block;
font-size: 40px;
line-height: 0;
margin-inline-end: var(--end-margin);
margin-inline-start: calc(-1 * var(--end-margin) - var(--width));
vertical-align: middle;
width: var(--width);
}
.match,
.referenced h2 {
/* This UI is intentionally the same in light and dark mode. */
background: yellow;
color: var(--google-grey-900);
}
.experiment-actions {
flex: 0 0 auto;
padding-inline-start: 5px;
text-align: right; /* csschecker-disable-line left-right */
width: 150px;
}
.experiment-origin-list-value {
resize: none;
}
select {
background: white;
border: 1px solid var(--link-color);
color: var(--link-color);
font-size: .8125rem;
height: 1.625rem;
letter-spacing: .01em;
max-width: 150px;
text-align-last: center;
width: 100%;
}
@media (prefers-color-scheme: dark) {
select {
background: var(--input-background);
border: none;
color: var(--primary-color);
}
option {
background: var(--toolbar-color);
}
}
textarea {
background: var(--input-background);
border-radius: 3px;
box-sizing: border-box;
color: inherit;
font-size: .8125rem;
margin: 0;
min-height: 3em;
padding: 8px;
width: 100%;
}
@media (prefers-color-scheme: dark) {
textarea {
border: 1px solid var(--secondary-color);
}
}
.experiment-switched select {
background: var(--link-color);
color: white;
}
@media (prefers-color-scheme: dark) {
.experiment-switched select {
color: var(--google-grey-900);
}
.experiment-switched option {
background: inherit;
color: inherit;
}
}
.experiment-no-match {
display: none;
position: absolute;
}
.permalink {
color: var(--secondary-color);
}
.tabs {
display: flex;
width: 100%;
@ -486,9 +348,8 @@ html:not(.focus-outline-visible) .tab:focus {
.tab-content {
display: none;
line-height: 25px;
margin-top: -50px;
/* Bottom padding should be greater than evaluated height of needs-restart */
padding-bottom: 200px;
padding-bottom: 100px;
position: relative;
}
@ -583,29 +444,6 @@ button.primary:-webkit-any(:active, :hover) {
}
@media (max-width: 480px) {
.experiment {
border-bottom: 1px solid var(--separator-color);
}
.experiment-name {
cursor: pointer;
}
.experiment .flex-container {
flex-flow: column;
}
.experiment .flex {
width: 100%;
}
.experiment .experiment-actions {
max-width: 100%;
padding-top: 12px;
text-align: left; /* csschecker-disable-line left-right */
width: 100%;
}
#flagsTemplate > .flex-container:first-child:not('.version') {
flex-direction: column;
text-align: left; /* csschecker-disable-line left-right */
@ -628,26 +466,13 @@ button.primary:-webkit-any(:active, :hover) {
padding: 4px;
}
/* Hide the overflow description text */
.experiment p {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 100%;
}
.searching .experiment p,
.experiment .expand p {
.searching flags-experiment::part(description) {
overflow: visible;
white-space: normal;
}
}
@media (max-width: 732px) {
.experiment-switched .experiment-name::before {
margin-inline-start: 0;
}
#version,
.blurb-warning {
display: block;

View File

@ -103,96 +103,13 @@
<div jsselect="supportedFeatures"
jsvalues="id:internal_name; class: is_default ? 'hidden' : 'experiment'"
jsdisplay="!is_default">
<div class="experiment-default"
jsvalues="class: is_default ? 'experiment-default flex-container'
: 'experiment-switched flex-container'">
<div class="flex">
<h2 class="experiment-name" jscontent="name"
jsvalues="title: is_default ? '' : '$i18n{experiment-enabled}';
id:internal_name + '_name'"></h2>
<p>
<span jsvalues=".textContent:description"></span>
<span class="platforms" jscontent="supported_platforms.join(', ')"></span>
</p>
<div jsdisplay="origin_list_value!==null">
<textarea class="experiment-origin-list-value"
jsvalues=".internal_name:internal_name; .value:origin_list_value;
aria-labelledby:internal_name + '_name'"
tabindex="7"></textarea>
</div>
<a class="permalink" jsvalues="href: '#' + internal_name"
jscontent="'#' + internal_name" tabindex="7"></a>
</div>
<div class="flex experiment-actions">
<div jsdisplay="options && options.length > 0">
<select class="experiment-select" tabindex="7"
jsvalues=".internal_name:internal_name;.disabled:!enabled;
aria-labelledby:internal_name + '_name'">
<option jsvalues=".selected:selected;"
jsselect="options"
jscontent="description">
</option>
</select>
</div>
<select class="experiment-enable-disable" tabindex="7"
jsdisplay="enabled !== undefined"
jsvalues=".internal_name:internal_name;
aria-labelledby:internal_name + '_name'">
<option jsvalues=".selected:!enabled; data-default: enabled ? 1 : 0"
value="disabled">$i18n{disabled}</option>
<option jsvalues=".selected:enabled; data-default: !enabled ? 1 : 0"
value="enabled">$i18n{enabled}</option>
</select>
</div>
</div>
<flags-experiment jsvalues=".data:$this"></flags-experiment>
</div>
<!-- Experiments with default settings. -->
<div class="experiment" jsselect="supportedFeatures"
jsvalues="id:internal_name; class: is_default ? 'experiment' : 'hidden'"
jsdisplay="is_default">
<div class="experiment-default"
jsvalues="class: is_default ? 'experiment-default flex-container'
: 'experiment-switched flex-container'">
<div class="flex">
<h2 class="experiment-name" jscontent="name"
jsvalues="title: is_default ? '' : '$i18n{experiment-enabled}';
id:internal_name + '_name'"></h2>
<p>
<span jsvalues=".textContent:description"></span>
<span class="platforms" jscontent="supported_platforms.join(', ')"></span>
</p>
<div jsdisplay="origin_list_value!==null">
<textarea class="experiment-origin-list-value"
jsvalues=".internal_name:internal_name; .value:origin_list_value;
aria-labelledby:internal_name + '_name'"
tabindex="7"></textarea>
</div>
<a class="permalink" jsvalues="href: '#' + internal_name"
jscontent="'#' + internal_name" tabindex="7"></a>
</div>
<div class="flex experiment-actions">
<div jsdisplay="options && options.length > 0">
<select class="experiment-select" tabindex="7"
jsvalues=".internal_name:internal_name;.disabled:!enabled;
aria-labelledby:internal_name + '_name'">
<option jsvalues=".selected:selected;"
jsselect="options"
jscontent="description">
</option>
</select>
</div>
<!-- Represent enabled / disabled options in a drop down -->
<select class="experiment-enable-disable" tabindex="7"
jsdisplay="enabled !== undefined"
jsvalues=".internal_name:internal_name;
aria-labelledby:internal_name + '_name'">
<option jsvalues=".selected:!enabled; data-default:!enabled ? 1 : 0"
value="disabled">$i18n{disabled}</option>
<option jsvalues=".selected:enabled; data-default: enabled ? 1 : 0"
value="enabled">$i18n{enabled}</option>
</select>
</div>
</div>
<flags-experiment jsvalues=".data:$this"></flags-experiment>
</div>
<div class="no-match hidden" role="alert">$i18n{no-results}</div>
</div>
@ -202,22 +119,7 @@
<div class="experiment"
jsselect="unsupportedFeatures"
jsvalues="id:internal_name">
<div class="experiment-default flex-container"
jsvalues="class: is_default ? 'experiment-default flex-container'
: 'experiment-switched flex-container'">
<div class="flex">
<h2 class="experiment-name"
jscontent="name"></h2>
<p>
<span jsvalues=".textContent:description"></span>
<span class="platforms" jscontent="supported_platforms.join(', ')"></span>
</p>
<a class="permalink"
jsvalues="href: '#' + internal_name"
jscontent="'#' + internal_name" tabindex="9"></a>
</div>
<div class="flex experiment-actions">$i18n{not-available-platform}</div>
</div>
<flags-experiment jsvalues=".data:$this" unsupported></flags-experiment>
</div>
<div class="no-match hidden" role="alert">
$i18n{no-results}

View File

@ -305,6 +305,7 @@ static_library("content_shell_lib") {
"//device/bluetooth",
"//media",
"//media/mojo:buildflags",
"//media/mojo/services",
"//net",
"//net:net_resources",
"//ppapi/buildflags",
@ -332,10 +333,7 @@ static_library("content_shell_lib") {
"browser/fuchsia_view_presenter.cc",
"browser/fuchsia_view_presenter.h",
]
deps += [
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.element:fuchsia.element_hlcpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy:fuchsia.ui.policy_hlcpp",
]
deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.element:fuchsia.element_hlcpp" ]
} else {
deps += [
"//components/crash/content/browser",
@ -673,6 +671,10 @@ if (is_android) {
configs -= [ "//build/config/win:console" ]
configs += [ "//build/config/win:windowed" ]
}
# Increase the initial stack size. The default is 1MB, this is 8MB.
# This matches the chrome.exe.
ldflags = [ "/STACK:0x800000" ]
}
if (is_win) {

View File

@ -21,6 +21,7 @@ import("//testing/test.gni")
import("//third_party/blink/public/public_features.gni")
import("//third_party/closure_compiler/closure_args.gni")
import("//third_party/closure_compiler/compile_js.gni")
import("//third_party/protobuf/proto_library.gni")
import("//tools/grit/grit_rule.gni")
import("//tools/grit/preprocess_if_expr.gni")
import("//tools/typescript/ts_library.gni")
@ -209,6 +210,8 @@ static_library("test_support") {
"../public/test/hit_test_region_observer.h",
"../public/test/javascript_test_observer.cc",
"../public/test/javascript_test_observer.h",
"../public/test/keep_alive_url_loader_utils.cc",
"../public/test/keep_alive_url_loader_utils.h",
"../public/test/local_frame_host_interceptor.cc",
"../public/test/local_frame_host_interceptor.h",
"../public/test/local_network_access_util.cc",
@ -318,6 +321,8 @@ static_library("test_support") {
"../public/test/test_renderer_host.cc",
"../public/test/test_renderer_host.h",
"../public/test/test_select_url_fenced_frame_config_observer.h",
"../public/test/test_shared_storage_header_observer.cc",
"../public/test/test_shared_storage_header_observer.h",
"../public/test/test_storage_partition.cc",
"../public/test/test_storage_partition.h",
"../public/test/test_utils.cc",
@ -499,10 +504,11 @@ static_library("test_support") {
deps = [
":content_test_mojo_bindings",
":web_ui_mojo_test_resources",
":web_ui_test_mojo_bindings",
"//base/third_party/dynamic_annotations",
"//build:chromeos_buildflags",
"//cc:test_support",
"//components/aggregation_service:mojom",
"//components/attribution_reporting:mojom",
"//components/attribution_reporting:source_type_mojom",
"//components/breadcrumbs/core",
@ -869,15 +875,17 @@ group("telemetry_gpu_integration_test_support") {
"//third_party/webgl/",
# For pixel_test and trace_test
"//media/test/data/four-colors.mp4",
"//media/test/data/four-colors.y4m",
"//media/test/data/four-colors-aspect-4x3.mp4",
"//media/test/data/four-colors-rot-90.mp4",
"//media/test/data/four-colors-av1.mp4",
"//media/test/data/four-colors-hevc.mp4",
"//media/test/data/four-colors-incompatible-stride.y4m",
"//media/test/data/four-colors-rot-180.mp4",
"//media/test/data/four-colors-rot-270.mp4",
"//media/test/data/four-colors-vp9.webm",
"//media/test/data/four-colors-rot-90.mp4",
"//media/test/data/four-colors-vp9-i420a.webm",
"//media/test/data/four-colors-incompatible-stride.y4m",
"//media/test/data/four-colors-vp9.webm",
"//media/test/data/four-colors.mp4",
"//media/test/data/four-colors.y4m",
# For power
"//media/test/data/bear-1280x720.mp4",
@ -1047,11 +1055,24 @@ mojom("content_test_mojo_bindings") {
mojom("web_ui_test_mojo_bindings") {
testonly = true
sources = [
"data/web_ui_managed_interface_test.test-mojom",
"data/web_ui_test.test-mojom",
"data/web_ui_test_types.test-mojom",
]
public_deps = [ "//url/mojom:url_mojom_gurl" ]
public_deps = [
":web_ui_js_bridge_test_bindings",
"//url/mojom:url_mojom_gurl",
]
webui_module_path = "/content/test/data"
}
mojom_with_webui_js_bridge("web_ui_js_bridge_test_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" ]
webui_module_path = "/content/test/data"
}
@ -1296,6 +1317,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/code_cache/generated_code_cache_browsertest.cc",
"../browser/compute_pressure/compute_pressure_origin_trial_browsertest.cc",
"../browser/content_index/content_index_browsertest.cc",
"../browser/content_security_policy_browsertest.cc",
@ -1505,7 +1527,6 @@ test("content_browsertests") {
"../browser/site_per_process_sad_frame_browsertest.cc",
"../browser/site_per_process_scroll_browsertest.cc",
"../browser/site_per_process_unload_browsertest.cc",
"../browser/site_per_process_web_bundle_browsertest.cc",
"../browser/sms/sms_browsertest.cc",
"../browser/snapshot_browsertest.cc",
"../browser/storage_partition_impl_browsertest.cc",
@ -1560,6 +1581,7 @@ 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",
@ -1619,13 +1641,13 @@ test("content_browsertests") {
":browsertest_support",
":content_test_mojo_bindings",
":test_support",
":web_ui_js_bridge_test_bindings_webui_js_bridge_impl",
":web_ui_test_mojo_bindings",
":web_ui_ts_test_mojo_bindings",
"//base/test:test_support",
"//build:chromecast_buildflags",
"//build:chromeos_buildflags",
"//cc/slim",
"//components/aggregation_service:mojom",
"//components/attribution_reporting:mojom",
"//components/discardable_memory/client",
"//components/discardable_memory/common",
@ -1718,6 +1740,7 @@ test("content_browsertests") {
"//third_party/zlib",
"//ui/accessibility:ax_base",
"//ui/accessibility:ax_enums_mojo",
"//ui/accessibility:test_support",
"//ui/base:test_support",
"//ui/base/clipboard",
"//ui/base/cursor",
@ -1742,24 +1765,25 @@ test("content_browsertests") {
"//ui/webui:test_support",
]
data_deps = [
"//content/shell:pak",
"//third_party/mesa_headers",
]
if (is_ios) {
bundle_deps = [
":content_test_bundle_data",
"//media/test:media_bundle_data",
"//testing/buildbot/filters:content_browsertests_filter_bundle_data",
]
} else {
data = [
"data/",
"//media/test/data/",
]
data_deps += [ "//testing/buildbot/filters:content_browsertests_filters" ]
}
data_deps = [
"//content/shell:pak",
"//testing/buildbot/filters:content_browsertests_filters",
"//third_party/mesa_headers",
]
if (enable_plugins) {
sources += [ "../browser/plugin_service_impl_browsertest.cc" ]
}
@ -2023,6 +2047,7 @@ test("content_browsertests") {
deps += [ "//third_party/ocmock" ]
data_deps += [ "//content/shell:thorium_shell" ]
data += [ "$root_out_dir/Thorium Shell.app/" ]
weak_frameworks = [ "ScreenCaptureKit.framework" ] # macOS 12.3
}
if (is_ios) {
@ -2068,7 +2093,7 @@ test("content_browsertests") {
"//mojo/public/mojom/base",
]
data_deps += [
"//content/shell:thorium_shell",
"//content/shell:content_shell",
"//mojo/core:shared_library",
]
if (use_ozone) {
@ -2169,6 +2194,7 @@ grit("web_ui_mojo_test_resources") {
"web_ui_mojo_test_resources.pak",
]
deps = [
":web_ui_js_bridge_test_bindings_js__generator",
":web_ui_mojo_test_build_ts",
":web_ui_test_mojo_bindings_js__generator",
]
@ -2201,7 +2227,6 @@ 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/touch_passthrough_manager_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",
@ -2364,6 +2389,7 @@ test("content_unittests") {
"../browser/interest_group/auction_runner_unittest.cc",
"../browser/interest_group/auction_url_loader_factory_proxy_unittest.cc",
"../browser/interest_group/auction_worklet_manager_unittest.cc",
"../browser/interest_group/bidding_and_auction_server_key_fetcher_unittest.cc",
"../browser/interest_group/interest_group_auction_reporter_unittest.cc",
"../browser/interest_group/interest_group_k_anonymity_manager_unittest.cc",
"../browser/interest_group/interest_group_pa_report_util_unittest.cc",
@ -2404,7 +2430,6 @@ test("content_unittests") {
"../browser/media/session/media_session_controller_unittest.cc",
"../browser/media/session/media_session_controllers_manager_unittest.cc",
"../browser/media/session/media_session_impl_service_routing_unittest.cc",
"../browser/media/session/media_session_impl_uma_unittest.cc",
"../browser/media/session/media_session_impl_unittest.cc",
"../browser/media/session/media_session_uma_helper_unittest.cc",
"../browser/media/system_media_controls_notifier_unittest.cc",
@ -2594,6 +2619,7 @@ test("content_unittests") {
"../browser/service_worker/service_worker_updated_script_loader_unittest.cc",
"../browser/service_worker/service_worker_version_unittest.cc",
"../browser/shareable_file_reference_unittest.cc",
"../browser/shared_storage/shared_storage_header_observer_unittest.cc",
"../browser/shared_storage/shared_storage_url_loader_factory_proxy_unittest.cc",
"../browser/site_instance_group_unittest.cc",
"../browser/site_instance_impl_unittest.cc",
@ -2687,6 +2713,8 @@ test("content_unittests") {
"../common/input/gesture_event_stream_validator_unittest.cc",
"../common/input/touch_event_stream_validator_unittest.cc",
"../common/pseudonymization_salt_unittest.cc",
"../common/service_worker/race_network_request_url_loader_client_unittest.cc",
"../common/service_worker/service_worker_router_evaluator_unittest.cc",
"../common/url_utils_unittest.cc",
"../common/user_agent_unittest.cc",
"../common/webid/identity_url_loader_throttle_unittest.cc",
@ -2715,11 +2743,16 @@ test("content_unittests") {
"test_render_frame_host_unittest.cc",
]
if (is_apple) {
configs += [ "//build/config/compiler:enable_arc" ]
}
if (is_mac) {
sources += [
"../browser/accessibility/browser_accessibility_mac_unittest.mm",
"../browser/child_process_task_port_provider_mac_unittest.cc",
"../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/native_web_keyboard_event_mac_unittest.mm",
@ -2769,6 +2802,7 @@ test("content_unittests") {
"../browser/accessibility/browser_accessibility_android_unittest.cc",
"../browser/android/nfc_host_unittest.cc",
"../browser/attribution_reporting/attribution_input_event_tracker_android_unittest.cc",
"../browser/attribution_reporting/attribution_os_level_manager_android_unittest.cc",
"../browser/renderer_host/input/web_input_event_builders_android_unittest.cc",
"../browser/web_contents/color_chooser_unittest.cc",
"../common/android/cpu_time_metrics_unittest.cc",
@ -2794,6 +2828,7 @@ test("content_unittests") {
bundle_deps = [
":content_shell_pak_bundle_data",
":content_test_bundle_data",
":content_test_perfetto_bundle_data",
"//media/test:media_bundle_data",
]
}
@ -2807,10 +2842,9 @@ test("content_unittests") {
":run_all_unittests",
":test_interfaces",
":test_support",
"web_ui:test_webui_js_bridge2_webui_js_bridge_impl",
"web_ui:test_webui_js_bridge_webui_js_bridge_impl",
"//base",
"//base/allocator:buildflags",
"//base/test:proto_test_support",
"//base/test:test_support",
"//base/third_party/dynamic_annotations",
"//build:chromecast_buildflags",
@ -2818,14 +2852,12 @@ test("content_unittests") {
"//cc",
"//cc:test_support",
"//cc/mojom",
"//components/aggregation_service:mojom",
"//components/attribution_reporting:mojom",
"//components/cbor",
"//components/network_session_configurator/browser",
"//components/network_session_configurator/common",
"//components/offline_pages/buildflags",
"//components/payments/mojom",
"//components/power_scheduler",
"//components/services/quarantine/public/mojom",
"//components/services/storage",
"//components/services/storage:filesystem_proxy_factory",
@ -2863,6 +2895,9 @@ 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",
@ -2960,6 +2995,11 @@ test("content_unittests") {
"//third_party/mesa_headers",
]
if (!is_ios) {
data_deps += [ "//third_party/perfetto/protos/perfetto/config/chrome:scenario_descriptor" ]
data += [ "$root_gen_dir/third_party/perfetto/protos/perfetto/config/chrome/scenario_config.descriptor" ]
}
# Platforms where sqlite_dev_shell is defined.
if (is_win || is_mac || is_linux || is_chromeos) {
sources += [ "../browser/attribution_reporting/attribution_storage_sql_query_plans_unittest.cc" ]
@ -3084,6 +3124,7 @@ test("content_unittests") {
}
if (is_mac) {
deps += [
"//device/fido:icloud_keychain_test_support",
"//sandbox/mac:seatbelt",
"//third_party/ocmock",
"//ui/accelerated_widget_mac",
@ -3092,7 +3133,9 @@ test("content_unittests") {
frameworks = [
"Carbon.framework",
"IOSurface.framework",
"AuthenticationServices.framework",
]
weak_frameworks = [ "ScreenCaptureKit.framework" ] # macOS 12.3
}
if (is_chromeos_ash) {
sources += [
@ -3192,11 +3235,6 @@ test("content_unittests") {
}
}
if (is_chromeos) {
sources +=
[ "../browser/smart_card/smart_card_reader_tracker_impl_unittest.cc" ]
}
if (use_aura) {
deps += [
"//ui/aura:test_support",
@ -3259,6 +3297,15 @@ if (is_ios) {
outputs = [ "{{bundle_resources_dir}}/content_shell.pak" ]
}
bundle_data("content_test_perfetto_bundle_data") {
testonly = true
_relative_path = "third_party/perfetto/protos/perfetto/config/chrome"
public_deps = [ "//third_party/perfetto/protos/perfetto/config/chrome:scenario_descriptor" ]
sources = [ "$root_gen_dir/$_relative_path/scenario_config.descriptor" ]
outputs =
[ "{{bundle_resources_dir}}/gen/$_relative_path/{{source_file_part}}" ]
}
bundle_data_from_filelist("content_test_bundle_data") {
testonly = true
filelist_name = "content_test_bundle_data.filelist"
@ -3328,14 +3375,16 @@ group("gpu_pytype") {
testonly = true
data = [
"//content/test/gpu/get_machine_times.py",
"//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/",
"//content/test/gpu/flake_suppressor/",
"//testing/flake_suppressor_common/",
"//content/test/gpu/machine_times/",
"//content/test/gpu/unexpected_passes/",
"//testing/flake_suppressor_common/",
"//testing/unexpected_passes_common/",
]