| 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 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 561 "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc", | 561 "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc", |
| 562 "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h", | 562 "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h", |
| 563 "../browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc
", | 563 "../browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc
", |
| 564 "../browser/ui/views/toolbar/toolbar_button_interactive_uitest.cc", | 564 "../browser/ui/views/toolbar/toolbar_button_interactive_uitest.cc", |
| 565 "../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc", | 565 "../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc", |
| 566 "../browser/ui/views/translate/translate_bubble_test_utils_views.cc", | 566 "../browser/ui/views/translate/translate_bubble_test_utils_views.cc", |
| 567 "../browser/ui/views/website_settings/website_settings_popup_view_inte
ractive_uitest.cc", | 567 "../browser/ui/views/website_settings/website_settings_popup_view_inte
ractive_uitest.cc", |
| 568 "base/interactive_test_utils_views.cc", | 568 "base/interactive_test_utils_views.cc", |
| 569 ] | 569 ] |
| 570 } | 570 } |
| 571 if (is_win || is_linux) { |
| 572 # TODO(crbug.com/679127): Enable these tests on "mac_views_browser" once |
| 573 # it is supported. |
| 574 sources += [ |
| 575 "../browser/ui/views/payments/payment_request_interactive_uitest.cc", |
| 576 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
cc", |
| 577 "../browser/ui/views/payments/payment_request_interactive_uitest_base.
h", |
| 578 ] |
| 579 } |
| 571 if (is_linux) { | 580 if (is_linux) { |
| 572 if (!is_chromeos) { | 581 if (!is_chromeos) { |
| 573 # Desktop linux. | 582 # Desktop linux. |
| 574 sources -= [ | 583 sources -= [ |
| 575 # TODO(port): This times out. Attempts have been made to fix the | 584 # TODO(port): This times out. Attempts have been made to fix the |
| 576 # individual failures, but each time I disable a test from these | 585 # individual failures, but each time I disable a test from these |
| 577 # suites, it seems like one or another starts timing out too. | 586 # suites, it seems like one or another starts timing out too. |
| 578 "../browser/ui/views/keyboard_access_browsertest.cc", | 587 "../browser/ui/views/keyboard_access_browsertest.cc", |
| 579 ] | 588 ] |
| 580 if (!use_ozone) { | 589 if (!use_ozone) { |
| (...skipping 1407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1988 "$root_out_dir/locales/", | 1997 "$root_out_dir/locales/", |
| 1989 "$root_out_dir/chrome_100_percent.pak", | 1998 "$root_out_dir/chrome_100_percent.pak", |
| 1990 "$root_out_dir/chrome_200_percent.pak", | 1999 "$root_out_dir/chrome_200_percent.pak", |
| 1991 "$root_out_dir/resources.pak", | 2000 "$root_out_dir/resources.pak", |
| 1992 ] | 2001 ] |
| 1993 } | 2002 } |
| 1994 | 2003 |
| 1995 # TODO(crbug.com/679127): Enable these tests on "mac_views_browser" once it | 2004 # TODO(crbug.com/679127): Enable these tests on "mac_views_browser" once it |
| 1996 # is supported. | 2005 # is supported. |
| 1997 if (is_linux || is_win) { | 2006 if (is_linux || is_win) { |
| 1998 sources += [ | 2007 sources += |
| 1999 "../browser/payments/payment_request_web_contents_manager_browsertest.cc
", | 2008 [ "../browser/payments/site_per_process_payments_browsertest.cc" ] |
| 2000 "../browser/payments/site_per_process_payments_browsertest.cc", | |
| 2001 ] | |
| 2002 } | 2009 } |
| 2003 | 2010 |
| 2004 if (!enable_one_click_signin) { | 2011 if (!enable_one_click_signin) { |
| 2005 sources -= [ "../browser/ui/sync/one_click_signin_links_delegate_impl_brow
sertest.cc" ] | 2012 sources -= [ "../browser/ui/sync/one_click_signin_links_delegate_impl_brow
sertest.cc" ] |
| 2006 } | 2013 } |
| 2007 if (enable_nacl) { | 2014 if (enable_nacl) { |
| 2008 sources += [ | 2015 sources += [ |
| 2009 "../browser/chrome_service_worker_browsertest.cc", | 2016 "../browser/chrome_service_worker_browsertest.cc", |
| 2010 "../browser/extensions/extension_nacl_browsertest.cc", | 2017 "../browser/extensions/extension_nacl_browsertest.cc", |
| 2011 "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc", | 2018 "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc", |
| (...skipping 3100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5112 } | 5119 } |
| 5113 | 5120 |
| 5114 if (is_win) { | 5121 if (is_win) { |
| 5115 loadable_module("conflicts_dll") { | 5122 loadable_module("conflicts_dll") { |
| 5116 testonly = true | 5123 testonly = true |
| 5117 sources = [ | 5124 sources = [ |
| 5118 "conflicts/conflicts_dll.cc", | 5125 "conflicts/conflicts_dll.cc", |
| 5119 ] | 5126 ] |
| 5120 } | 5127 } |
| 5121 } | 5128 } |
| OLD | NEW |