Skip to content

Commit

Permalink
[fuchsia] Make components_browsertests pass
Browse files Browse the repository at this point in the history
This adds missing manifest fragments for this test suite and modifies
test expectations due to having no system-wide font list
implementation on Fuchsia.
In addition, that same test is enabled on Android with the same set of
expectations as on Fuchsia since it was disabled for the same reason.

Bug: 1260529
Change-Id: I2f0bc79a1fb7d75fb9b7491f122363815f23ffe0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3339815
Reviewed-by: Mohamad Ahmadi <mahmadi@chromium.org>
Commit-Queue: Fabrice de Gans <fdegans@chromium.org>
Cr-Commit-Position: refs/heads/main@{#951722}
  • Loading branch information
Steelskin authored and Chromium LUCI CQ committed Dec 14, 2021
1 parent 9d0ca76 commit d2750d5
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
10 changes: 9 additions & 1 deletion components/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,6 @@ if (!is_ios) {
"browser_ui/client_certificate/android/ssl_client_certificate_request_browsertest.cc",
"test/android/browsertests_apk/components_browser_tests_jni_onload.cc",
]
sources -= [ "autofill/content/browser/risk/fingerprint_browsertest.cc" ]
deps += [
"//components/autofill_assistant/browser",
"//components/autofill_assistant/browser:proto",
Expand Down Expand Up @@ -839,6 +838,15 @@ if (!is_ios) {
if (!is_chromeos_lacros) {
assert_no_deps = [ "//chrome/*" ]
}

if (is_fuchsia) {
additional_manifest_fragments = [
"//build/config/fuchsia/test/font_capabilities.test-cmx",
"//build/config/fuchsia/test/jit_capabilities.test-cmx",
"//build/config/fuchsia/test/network_capabilities.test-cmx",
"//build/config/fuchsia/test/present_view_capabilities.test-cmx",
]
}
}

test("components_perftests") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,13 @@ class AutofillRiskFingerprintTest : public content::ContentBrowserTest {
fingerprint->machine_characteristics();
EXPECT_TRUE(machine.has_operating_system_build());
EXPECT_TRUE(machine.has_browser_install_time_hours());

#if defined(OS_FUCHSIA) || defined(OS_ANDROID)
// GetFontList() returns an empty list on Fuchsia and Android.
EXPECT_EQ(machine.font_size(), 0);
#else
EXPECT_GT(machine.font_size(), 0);
#endif // defined(OS_FUCHSIA) || defined(OS_ANDROID)

// TODO(isherman): http://crbug.com/358548 and EXPECT_EQ.
EXPECT_GE(machine.plugin_size(), 0);
Expand Down

0 comments on commit d2750d5

Please sign in to comment.