Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 import("//build/module_args/v8.gni") | 8 import("//build/module_args/v8.gni") |
| 9 import("//testing/test.gni") | 9 import("//testing/test.gni") |
| 10 | 10 |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 210 "//chrome:strings", | 210 "//chrome:strings", |
| 211 "//chrome/browser", | 211 "//chrome/browser", |
| 212 "//chrome/common", | 212 "//chrome/common", |
| 213 "//mojo/environment:chromium", | 213 "//mojo/environment:chromium", |
| 214 "//third_party/mojo/src/mojo/edk/system", | 214 "//third_party/mojo/src/mojo/edk/system", |
| 215 ] | 215 ] |
| 216 } | 216 } |
| 217 | 217 |
| 218 if (!is_android) { | 218 if (!is_android) { |
| 219 import("//chrome/chrome_tests.gni") | 219 import("//chrome/chrome_tests.gni") |
| 220 import("//third_party/protobuf/proto_library.gni") | |
| 221 | |
| 222 # GYP version: chrome/chrome_tests_unit.gypi:ipc_protobuf_message_test_proto | |
| 223 proto_library("test_proto") { | |
| 224 sources = [ | |
| 225 "../common/safe_browsing/ipc_protobuf_message_test.proto", | |
| 226 ] | |
| 227 } | |
| 220 | 228 |
| 221 test("interactive_ui_tests") { | 229 test("interactive_ui_tests") { |
| 222 sources = | 230 sources = |
| 223 rebase_path(chrome_tests_gypi_values.chrome_interactive_ui_test_sources, | 231 rebase_path(chrome_tests_gypi_values.chrome_interactive_ui_test_sources, |
| 224 ".", | 232 ".", |
| 225 "//chrome") | 233 "//chrome") |
| 226 | 234 |
| 227 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] | 235 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] |
| 228 ldflags = [] | 236 ldflags = [] |
| 229 | 237 |
| (...skipping 1214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1444 ] | 1452 ] |
| 1445 } | 1453 } |
| 1446 } | 1454 } |
| 1447 if (safe_browsing_mode == 1) { | 1455 if (safe_browsing_mode == 1) { |
| 1448 # TODO(sgurun): enable tests for safe_browsing==2. | 1456 # TODO(sgurun): enable tests for safe_browsing==2. |
| 1449 sources += rebase_path( | 1457 sources += rebase_path( |
| 1450 unit_gypi_values.chrome_unit_tests_full_safe_browsing_sources, | 1458 unit_gypi_values.chrome_unit_tests_full_safe_browsing_sources, |
| 1451 ".", | 1459 ".", |
| 1452 "//chrome") | 1460 "//chrome") |
| 1453 defines += [ "FULL_SAFE_BROWSING" ] | 1461 defines += [ "FULL_SAFE_BROWSING" ] |
| 1462 deps += [ ":test_proto" ] | |
| 1454 if (is_chromeos) { | 1463 if (is_chromeos) { |
| 1455 sources -= [ "../browser/safe_browsing/download_protection_service_unitt est.cc" ] | 1464 deps -= [ ":test_proto" ] |
| 1465 sources -= [ | |
| 1466 "../browser/safe_browsing/download_protection_service_unittest.cc", | |
| 1467 "../common/safe_browsing/ipc_protobuf_message_test_messages.h", | |
| 1468 "../common/safe_browsing/ipc_protobuf_message_unittest.cc", | |
|
mattm
2015/03/17 22:15:50
Hm, weird. I don't think these should be disabled
grt (UTC plus 2)
2015/03/18 16:48:01
I wondered about that. I've removed the extra stuf
| |
| 1469 ] | |
| 1456 } else if (is_android) { | 1470 } else if (is_android) { |
| 1471 deps -= [ ":test_proto" ] | |
| 1457 sources -= [ | 1472 sources -= [ |
| 1458 # Android doesn't support download feedbacks. | 1473 # Android doesn't support download feedbacks. |
| 1459 "../browser/safe_browsing/download_feedback_service_unittest.cc", | 1474 "../browser/safe_browsing/download_feedback_service_unittest.cc", |
| 1460 "../browser/safe_browsing/download_feedback_unittest.cc", | 1475 "../browser/safe_browsing/download_feedback_unittest.cc", |
| 1461 "../browser/safe_browsing/download_protection_service_unittest.cc", | 1476 "../browser/safe_browsing/download_protection_service_unittest.cc", |
| 1462 "../browser/safe_browsing/two_phase_uploader_unittest.cc", | 1477 "../browser/safe_browsing/two_phase_uploader_unittest.cc", |
| 1478 "../common/safe_browsing/ipc_protobuf_message_test_messages.h", | |
| 1479 "../common/safe_browsing/ipc_protobuf_message_unittest.cc", | |
| 1463 ] | 1480 ] |
| 1464 } | 1481 } |
| 1465 } | 1482 } |
| 1466 if (enable_autofill_dialog && !is_android) { | 1483 if (enable_autofill_dialog && !is_android) { |
| 1467 sources += rebase_path( | 1484 sources += rebase_path( |
| 1468 unit_gypi_values.chrome_unit_tests_autofill_dialog_sources, | 1485 unit_gypi_values.chrome_unit_tests_autofill_dialog_sources, |
| 1469 ".", | 1486 ".", |
| 1470 "//chrome") | 1487 "//chrome") |
| 1471 } | 1488 } |
| 1472 if (enable_plugins) { | 1489 if (enable_plugins) { |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1680 } | 1697 } |
| 1681 if (use_ozone) { | 1698 if (use_ozone) { |
| 1682 # crbug.com/354036 | 1699 # crbug.com/354036 |
| 1683 sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ] | 1700 sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ] |
| 1684 } | 1701 } |
| 1685 if (!enable_plugin_installation) { | 1702 if (!enable_plugin_installation) { |
| 1686 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ] | 1703 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ] |
| 1687 } | 1704 } |
| 1688 } | 1705 } |
| 1689 } | 1706 } |
| OLD | NEW |