Skip to content

Commit

Permalink
[gn check] Enable //chrome/test:usage_time_limit_unittests
Browse files Browse the repository at this point in the history
As part of this, we remove files from being built in the target itself
that are also built in //chrome/browser/chromeos, now a dependency of
this target. This also entails filling in missing deps in
//chrome/browser/chromeos itself that then were revealed, as well as
having the usage_time_limit_unittests target depend directly on
//chrome/browser as well (//chrome/browser/chromeos requires
//chrome/browser to be built but cannot depend on it in GN due to a
dependency cycle :\).

Bug: 1158929
Change-Id: Ida25548b2b39db1a9ee4665f3b8a170471772237
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2909545
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#887095}
  • Loading branch information
colinblundell authored and Chromium LUCI CQ committed May 27, 2021
1 parent b09be7b commit b51f4e7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion .gn
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ no_check_targets = [
"//chrome/test:interactive_ui_tests",
"//chrome/test:unit_tests",
"//chrome/test:unit_tests__library",
"//chrome/test:usage_time_limit_unittests",
"//chrome/test:xr_browser_tests_common",
"//extensions/browser:*", # 20 errors
"//extensions:*", # 75 errors
Expand Down
2 changes: 2 additions & 0 deletions chrome/browser/chromeos/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ source_set("chromeos") {
"//chrome/app/theme:chrome_unscaled_resources",
"//chrome/app/theme:theme_resources",
"//chrome/browser/chromeos/power/ml:user_activity_ukm_logger_helpers",
"//chrome/browser/ui/webui/chromeos/crostini_installer:mojo_bindings",
"//chrome/browser/ui/webui/chromeos/emoji:mojo_bindings",
"//chromeos/components/security_token_pin",
"//chromeos/dbus:anomaly_detector_proto",
"//chromeos/dbus:cicerone_proto",
Expand Down
6 changes: 2 additions & 4 deletions chrome/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -8320,17 +8320,15 @@ if (is_chromeos_ash) {
"../browser/ash/child_accounts/time_limit_consistency_test/consistency_test_utils.h",
"../browser/ash/child_accounts/time_limit_consistency_test/proto_matcher.h",
"../browser/ash/child_accounts/time_limit_consistency_test/run_all_unittests.cc",
"../browser/ash/child_accounts/time_limit_override.cc",
"../browser/ash/child_accounts/time_limit_override.h",
"../browser/ash/child_accounts/time_limit_test_utils.cc",
"../browser/ash/child_accounts/time_limit_test_utils.h",
"../browser/ash/child_accounts/usage_time_limit_processor.cc",
"../browser/ash/child_accounts/usage_time_limit_processor.h",
]
deps = [
":consistency_golden_proto",
"//base",
"//base/test:test_support",
"//chrome/browser",
"//chrome/browser/chromeos",
"//chromeos/settings",
"//testing/gmock",
"//testing/gtest",
Expand Down

0 comments on commit b51f4e7

Please sign in to comment.