| 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 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 574 } | 574 } |
| 575 if (is_win || is_linux) { | 575 if (is_win || is_linux) { |
| 576 # TODO(crbug.com/679127): Investigate why these tests currently break | 576 # TODO(crbug.com/679127): Investigate why these tests currently break |
| 577 # on Mac, and enable them. | 577 # on Mac, and enable them. |
| 578 sources += [ | 578 sources += [ |
| 579 "../browser/ui/views/payments/payment_method_view_controller_interacti
ve_uitest.cc", | 579 "../browser/ui/views/payments/payment_method_view_controller_interacti
ve_uitest.cc", |
| 580 "../browser/ui/views/payments/payment_request_credit_card_editor_inter
active_uitest.cc", | 580 "../browser/ui/views/payments/payment_request_credit_card_editor_inter
active_uitest.cc", |
| 581 "../browser/ui/views/payments/payment_request_interactive_uitest.cc", | 581 "../browser/ui/views/payments/payment_request_interactive_uitest.cc", |
| 582 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
cc", | 582 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
cc", |
| 583 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
h", | 583 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
h", |
| 584 "../browser/ui/views/payments/payment_sheet_view_controller_interactiv
e_uitest.cc", |
| 584 ] | 585 ] |
| 585 } | 586 } |
| 586 if (is_linux) { | 587 if (is_linux) { |
| 587 if (!is_chromeos) { | 588 if (!is_chromeos) { |
| 588 # Desktop linux. | 589 # Desktop linux. |
| 589 sources -= [ | 590 sources -= [ |
| 590 # TODO(port): This times out. Attempts have been made to fix the | 591 # TODO(port): This times out. Attempts have been made to fix the |
| 591 # individual failures, but each time I disable a test from these | 592 # individual failures, but each time I disable a test from these |
| 592 # suites, it seems like one or another starts timing out too. | 593 # suites, it seems like one or another starts timing out too. |
| 593 "../browser/ui/views/keyboard_access_browsertest.cc", | 594 "../browser/ui/views/keyboard_access_browsertest.cc", |
| (...skipping 4583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5177 } | 5178 } |
| 5178 | 5179 |
| 5179 if (is_win) { | 5180 if (is_win) { |
| 5180 loadable_module("conflicts_dll") { | 5181 loadable_module("conflicts_dll") { |
| 5181 testonly = true | 5182 testonly = true |
| 5182 sources = [ | 5183 sources = [ |
| 5183 "conflicts/conflicts_dll.cc", | 5184 "conflicts/conflicts_dll.cc", |
| 5184 ] | 5185 ] |
| 5185 } | 5186 } |
| 5186 } | 5187 } |
| OLD | NEW |