| 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//chrome/common/features.gni") | 10 import("//chrome/common/features.gni") |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 "../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc", | 569 "../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc", |
| 570 "../browser/ui/views/translate/translate_bubble_test_utils_views.cc", | 570 "../browser/ui/views/translate/translate_bubble_test_utils_views.cc", |
| 571 "../browser/ui/views/website_settings/website_settings_popup_view_inte
ractive_uitest.cc", | 571 "../browser/ui/views/website_settings/website_settings_popup_view_inte
ractive_uitest.cc", |
| 572 "base/interactive_test_utils_views.cc", | 572 "base/interactive_test_utils_views.cc", |
| 573 ] | 573 ] |
| 574 } | 574 } |
| 575 if (is_win || is_linux) { | 575 if (is_win || is_linux) { |
| 576 # TODO(crbug.com/679127): Enable these tests on "mac_views_browser" once | 576 # TODO(crbug.com/679127): Enable these tests on "mac_views_browser" once |
| 577 # it is supported. | 577 # it is supported. |
| 578 sources += [ | 578 sources += [ |
| 579 "../browser/ui/views/payments/payment_request_credit_card_editor_inter
active_uitest.cc", |
| 579 "../browser/ui/views/payments/payment_request_interactive_uitest.cc", | 580 "../browser/ui/views/payments/payment_request_interactive_uitest.cc", |
| 580 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
cc", | 581 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
cc", |
| 581 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
h", | 582 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
h", |
| 582 ] | 583 ] |
| 583 } | 584 } |
| 584 if (is_linux) { | 585 if (is_linux) { |
| 585 if (!is_chromeos) { | 586 if (!is_chromeos) { |
| 586 # Desktop linux. | 587 # Desktop linux. |
| 587 sources -= [ | 588 sources -= [ |
| 588 # TODO(port): This times out. Attempts have been made to fix the | 589 # TODO(port): This times out. Attempts have been made to fix the |
| (...skipping 4571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5160 } | 5161 } |
| 5161 | 5162 |
| 5162 if (is_win) { | 5163 if (is_win) { |
| 5163 loadable_module("conflicts_dll") { | 5164 loadable_module("conflicts_dll") { |
| 5164 testonly = true | 5165 testonly = true |
| 5165 sources = [ | 5166 sources = [ |
| 5166 "conflicts/conflicts_dll.cc", | 5167 "conflicts/conflicts_dll.cc", |
| 5167 ] | 5168 ] |
| 5168 } | 5169 } |
| 5169 } | 5170 } |
| OLD | NEW |