Index: chrome/test/BUILD.gn |
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn |
index defc2a0b49019e35b52ec57b3401902ca16b1080..88d7b73a1be232658ac59748dc32dbd690594a01 100644 |
--- a/chrome/test/BUILD.gn |
+++ b/chrome/test/BUILD.gn |
@@ -118,10 +118,9 @@ source_set("test_support") { |
"//components/sync_driver:test_support", |
"//components/sync_sessions:test_support", |
"//components/syncable_prefs:test_support", |
- "//components/update_client:test_support", |
"//components/ui/zoom:test_support", |
+ "//components/update_client:test_support", |
"//content/public/app:both", |
- "//ui/gfx:test_support", |
"//net", |
"//net:test_support", |
"//skia", |
@@ -131,6 +130,7 @@ source_set("test_support") { |
"//testing/gmock", |
"//testing/gtest", |
"//third_party/zlib", |
+ "//ui/gfx:test_support", |
"//ui/message_center:test_support", |
] |
@@ -140,11 +140,6 @@ source_set("test_support") { |
"//chrome/plugin", |
"//chrome/renderer", |
"//chrome/utility", |
- "//content/public/child", |
- "//content/public/common", |
- "//content/public/plugin", |
- "//content/public/renderer", |
- "//content/public/utility", |
"//components/autofill/core/browser:test_support", |
"//components/captive_portal:test_support", |
"//components/guest_view/browser:test_support", |
@@ -152,6 +147,11 @@ source_set("test_support") { |
"//components/sessions:test_support", |
"//components/user_manager:test_support", |
"//components/web_resource:test_support", |
+ "//content/public/child", |
+ "//content/public/common", |
+ "//content/public/plugin", |
+ "//content/public/renderer", |
+ "//content/public/utility", |
"//google_apis:test_support", |
"//ipc:test_support", |
"//media:test_support", |
@@ -329,13 +329,13 @@ if (!is_android) { |
":test_support", |
":test_support_ui", |
"//base/allocator", |
+ "//chrome:packed_extra_resources", |
+ "//chrome:packed_resources", |
+ "//chrome:resources", |
+ "//chrome:strings", |
"//chrome/browser", |
"//chrome/browser/devtools", |
"//chrome/renderer", |
- "//chrome:resources", |
- "//chrome:strings", |
- "//chrome:packed_extra_resources", |
- "//chrome:packed_resources", |
"//components/resources", |
"//content/app/resources", |
"//crypto:platform", |
@@ -397,8 +397,7 @@ if (!is_android) { |
# suites, it seems like one or another starts timing out too. |
"../browser/ui/views/keyboard_access_browsertest.cc", |
] |
- sources += |
- [ "../browser/ui/libgtk2ui/select_file_dialog_interactive_uitest.cc" ] |
+ sources += [ "../browser/ui/libgtk2ui/select_file_dialog_interactive_uitest.cc" ] |
configs += [ "//build/config/linux/gtk2:gtk2_internal_config" ] |
} |
} |
@@ -588,8 +587,8 @@ if (!is_android) { |
"//net", |
"//skia", |
"//sync", |
- "//sync:test_support_sync_testserver", |
"//sync:test_support_sync_fake_server", |
+ "//sync:test_support_sync_testserver", |
"//ui/app_list:test_support", |
] |
@@ -1323,9 +1322,9 @@ if (!is_android) { |
"//sync", |
"//testing/gmock", |
"//testing/gtest", |
+ "//third_party/WebKit/public:blink", |
"//third_party/icu", |
"//third_party/leveldatabase", |
- "//third_party/WebKit/public:blink", |
] |
data_deps = [ |
@@ -1544,10 +1543,10 @@ test("unit_tests") { |
":test_support_unit", |
"//base/test:test_support", |
"//chrome/test:test_support", |
- "//components/resources", |
"//components/content_settings/core/test:test_support", |
- "//content/test:test_support", |
+ "//components/resources", |
"//content/public/app:both", |
+ "//content/test:test_support", |
"//crypto:platform", |
"//crypto:test_support", |
"//net", |
@@ -1589,10 +1588,10 @@ test("unit_tests") { |
"//components/metrics/proto", |
"//components/safe_browsing_db", |
"//components/safe_json:test_support", |
- "//components/webdata_services:test_support", |
"//components/strings", |
- "//device/bluetooth:mocks", |
+ "//components/webdata_services:test_support", |
"//content/app/resources", |
+ "//device/bluetooth:mocks", |
"//gpu:test_support", |
"//media:test_support", |
@@ -1722,9 +1721,9 @@ test("unit_tests") { |
if (use_aura) { |
sources += [ "//ui/views/controls/webview/webview_unittest.cc" ] |
deps += [ |
- "//ui/wm", |
"//ui/aura:test_support", |
"//ui/views:test_support", |
+ "//ui/wm", |
] |
} |
if (!is_chromeos && is_linux) { |
@@ -1735,8 +1734,8 @@ test("unit_tests") { |
} |
if (!is_chromeos && !use_ozone && is_linux) { |
deps += [ |
- "//chrome/browser/ui/libgtk2ui", |
"//build/linux:gio", |
+ "//chrome/browser/ui/libgtk2ui", |
] |
} |
@@ -1942,9 +1941,9 @@ test("unit_tests") { |
} |
if (!is_mac && !is_ios) { |
deps += [ |
- "//chrome/tools/convert_dict:lib", |
"//chrome:packed_extra_resources", |
"//chrome:packed_resources", |
+ "//chrome/tools/convert_dict:lib", |
"//third_party/hunspell", |
] |
} |
@@ -1976,8 +1975,8 @@ test("unit_tests") { |
"//chrome") |
deps += [ |
"//chrome:other_version", |
- "//chrome_elf:blacklist_test_dll_1", |
"//chrome/installer/util:strings", |
+ "//chrome_elf:blacklist_test_dll_1", |
"//third_party/iaccessible2", |
"//third_party/isimpledom", |
"//third_party/wtl", |
@@ -2104,12 +2103,12 @@ if (is_win || (is_linux && !is_chromeos)) { |
] |
deps = [ |
":test_support", |
+ "//base/test:run_all_unittests", |
+ "//base/test:test_support", |
"//breakpad:client", |
"//chrome/browser", |
"//chrome/child", |
"//components/crash/core/common", |
- "//base/test:run_all_unittests", |
- "//base/test:test_support", |
] |
if (cld_version == 2) { |
# Use whatever CLD2 data access mode that the |