| 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 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 566 "../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc", | 566 "../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc", |
| 567 "../browser/ui/views/translate/translate_bubble_test_utils_views.cc", | 567 "../browser/ui/views/translate/translate_bubble_test_utils_views.cc", |
| 568 "../browser/ui/views/website_settings/website_settings_popup_view_inte
ractive_uitest.cc", | 568 "../browser/ui/views/website_settings/website_settings_popup_view_inte
ractive_uitest.cc", |
| 569 "base/interactive_test_utils_views.cc", | 569 "base/interactive_test_utils_views.cc", |
| 570 ] | 570 ] |
| 571 } | 571 } |
| 572 if (is_win || is_linux) { | 572 if (is_win || is_linux) { |
| 573 # TODO(crbug.com/679127): Enable these tests on "mac_views_browser" once | 573 # TODO(crbug.com/679127): Enable these tests on "mac_views_browser" once |
| 574 # it is supported. | 574 # it is supported. |
| 575 sources += [ | 575 sources += [ |
| 576 "../browser/ui/views/payments/payment_request_credit_card_editor_inter
active_uitest.cc", |
| 576 "../browser/ui/views/payments/payment_request_interactive_uitest.cc", | 577 "../browser/ui/views/payments/payment_request_interactive_uitest.cc", |
| 577 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
cc", | 578 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
cc", |
| 578 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
h", | 579 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
h", |
| 579 ] | 580 ] |
| 580 } | 581 } |
| 581 if (is_linux) { | 582 if (is_linux) { |
| 582 if (!is_chromeos) { | 583 if (!is_chromeos) { |
| 583 # Desktop linux. | 584 # Desktop linux. |
| 584 sources -= [ | 585 sources -= [ |
| 585 # TODO(port): This times out. Attempts have been made to fix the | 586 # TODO(port): This times out. Attempts have been made to fix the |
| (...skipping 4563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5149 } | 5150 } |
| 5150 | 5151 |
| 5151 if (is_win) { | 5152 if (is_win) { |
| 5152 loadable_module("conflicts_dll") { | 5153 loadable_module("conflicts_dll") { |
| 5153 testonly = true | 5154 testonly = true |
| 5154 sources = [ | 5155 sources = [ |
| 5155 "conflicts/conflicts_dll.cc", | 5156 "conflicts/conflicts_dll.cc", |
| 5156 ] | 5157 ] |
| 5157 } | 5158 } |
| 5158 } | 5159 } |
| OLD | NEW |