| Index: chrome/test/BUILD.gn | 
| diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn | 
| index b197289000713d5ac85ffde2913a284d6821b6c5..a938189638902eb57a993245b63cc26d954cc94d 100644 | 
| --- a/chrome/test/BUILD.gn | 
| +++ b/chrome/test/BUILD.gn | 
| @@ -31,7 +31,22 @@ static_library("test_support") { | 
| defines = [] | 
| testonly = true | 
|  | 
| + | 
| + | 
| +  deps = [ | 
| +    "//base", | 
| +    "//base/test:test_support", | 
| +    "//services/shell/background:lib", | 
| +    "//services/shell/background/tests:test_support", | 
| +    "//services/shell/public/cpp:sources", | 
| +    "//services/ui/common:mus_common", | 
| +    "//testing/gtest", | 
| +    "//ui/aura", | 
| +    "//ui/gl:test_support", | 
| +  ] | 
| + | 
| sources = [ | 
| +    "//ui/views/test/native_widget_factory_mus.cc", | 
| "base/chrome_process_util.cc", | 
| "base/chrome_process_util.h", | 
| "base/chrome_process_util_mac.cc", | 
| @@ -83,6 +98,8 @@ static_library("test_support") { | 
| "logging/win/mof_data_parser.h", | 
| "logging/win/test_log_collector.cc", | 
| "logging/win/test_log_collector.h", | 
| +    "views_chrome_test_suite.cc", | 
| +    "views_chrome_test_suite.h", | 
| ] | 
|  | 
| configs += [ "//build/config:precompiled_headers" ] | 
| @@ -3242,6 +3259,7 @@ test("unit_tests") { | 
| "../browser/translate/translate_service_unittest.cc", | 
| "../browser/ui/android/tab_model/tab_model_list_unittest.cc", | 
| "../browser/ui/android/tab_model/tab_model_unittest.cc", | 
| +    "../browser/ui/ash/app_list/app_list_presenter_delegate_mus_unittest.cc", | 
| "../browser/ui/autofill/autofill_dialog_models_unittest.cc", | 
| "../browser/ui/autofill/autofill_popup_layout_model_unittest.cc", | 
| "../browser/ui/autofill/popup_view_common_unittest.cc", | 
| @@ -3331,6 +3349,8 @@ test("unit_tests") { | 
| "../../tools/json_schema_compiler/test/idl_schemas_unittest.cc", | 
| "../../tools/json_schema_compiler/test/objects_unittest.cc", | 
| "../../tools/json_schema_compiler/test/simple_api_unittest.cc", | 
| + | 
| +    "run_all_unittests_chrome.cc", | 
| ] | 
|  | 
| configs += [ "//build/config:precompiled_headers" ] | 
| @@ -3391,6 +3411,7 @@ test("unit_tests") { | 
| "//crypto:test_support", | 
| "//net", | 
| "//net:test_support", | 
| +    "//services/ui/public/cpp/tests:unittest_support", | 
| "//testing/gmock", | 
| "//testing/gtest", | 
|  | 
| @@ -3411,8 +3432,25 @@ test("unit_tests") { | 
| "//ui/display:test_support", | 
| "//ui/gfx:test_support", | 
| "//ui/resources", | 
| +    "//services/shell/background:main",  # Provides main(). | 
| ] | 
| -  data_deps = [] | 
| + | 
| +  data_deps = [ | 
| +    ":unittests_manifest", | 
| +    "//services/ui/test_wm", | 
| +  ] | 
| + | 
| +  if (use_x11) { | 
| +    configs += [ | 
| +      "//build/config/linux:x11", | 
| +      "//build/config/linux:xext", | 
| +    ] | 
| +    deps += [ | 
| +      "//ui/events/devices", | 
| +      "//ui/events/platform/x11", | 
| +      "//ui/gfx/x", | 
| +    ] | 
| +  } | 
|  | 
| if (!is_ios) { | 
| deps += [ | 
| @@ -5004,3 +5042,9 @@ if (is_chromeos) { | 
| } | 
| } | 
| } | 
| + | 
| +service_manifest("unittests_manifest") { | 
| +  type = "exe" | 
| +  name = "unit_tests" | 
| +  source = "unittests_manifest.json" | 
| +} | 
|  |