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/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 2102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2113 } | 2113 } |
| 2114 if (toolkit_views) { | 2114 if (toolkit_views) { |
| 2115 sources += [ | 2115 sources += [ |
| 2116 "../browser/ui/global_error/global_error_service_browsertest.cc", | 2116 "../browser/ui/global_error/global_error_service_browsertest.cc", |
| 2117 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win .cc", | 2117 "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win .cc", |
| 2118 "../browser/ui/views/frame/browser_window_property_manager_browsertest_w in.cc", | 2118 "../browser/ui/views/frame/browser_window_property_manager_browsertest_w in.cc", |
| 2119 "../browser/ui/views/select_file_dialog_extension_browsertest.cc", | 2119 "../browser/ui/views/select_file_dialog_extension_browsertest.cc", |
| 2120 ] | 2120 ] |
| 2121 deps += [ "//ui/views" ] | 2121 deps += [ "//ui/views" ] |
| 2122 if (!is_chromeos && (!is_mac || mac_views_browser)) { | 2122 if (!is_chromeos && (!is_mac || mac_views_browser)) { |
| 2123 sources += [ "../browser/ui/views/profiles/profile_chooser_view_browsert est.cc" ] | 2123 sources += [ |
| 2124 "../browser/ui/views/external_protocol_dialog_browsertest.cc", | |
| 2125 "../browser/ui/views/profiles/profile_chooser_view_browsertest.cc", | |
| 2126 ] | |
| 2124 } | 2127 } |
| 2125 if (!is_mac || mac_views_browser) { | 2128 if (!is_mac || mac_views_browser) { |
| 2126 sources += [ | 2129 sources += [ |
| 2127 # TODO(tapted): Move these to chrome_browser_tests_views_sources when the | 2130 # TODO(tapted): Move these to chrome_browser_tests_views_sources when the |
| 2128 # the corresponding files are moved in chrome_browser_ui.gypi (i.e. ou t of | 2131 # the corresponding files are moved in chrome_browser_ui.gypi (i.e. ou t of |
| 2129 # chrome_browser_ui_views_non_mac_sources). http://crbug.com/404979. | 2132 # chrome_browser_ui_views_non_mac_sources). http://crbug.com/404979. |
| 2130 "../browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc" , | 2133 "../browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc" , |
| 2131 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.cc" , | 2134 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.cc" , |
| 2132 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h", | 2135 "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h", |
| 2133 "../browser/ui/views/autofill/password_generation_popup_view_tester_vi ews.cc", | 2136 "../browser/ui/views/autofill/password_generation_popup_view_tester_vi ews.cc", |
| (...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3118 "../browser/download/download_request_limiter_unittest.cc", | 3121 "../browser/download/download_request_limiter_unittest.cc", |
| 3119 "../browser/download/download_resource_throttle_unittest.cc", | 3122 "../browser/download/download_resource_throttle_unittest.cc", |
| 3120 "../browser/download/download_status_updater_unittest.cc", | 3123 "../browser/download/download_status_updater_unittest.cc", |
| 3121 "../browser/download/download_target_determiner_unittest.cc", | 3124 "../browser/download/download_target_determiner_unittest.cc", |
| 3122 "../browser/download/download_ui_controller_unittest.cc", | 3125 "../browser/download/download_ui_controller_unittest.cc", |
| 3123 "../browser/engagement/important_sites_util_unittest.cc", | 3126 "../browser/engagement/important_sites_util_unittest.cc", |
| 3124 "../browser/engagement/site_engagement_eviction_policy_unittest.cc", | 3127 "../browser/engagement/site_engagement_eviction_policy_unittest.cc", |
| 3125 "../browser/engagement/site_engagement_helper_unittest.cc", | 3128 "../browser/engagement/site_engagement_helper_unittest.cc", |
| 3126 "../browser/engagement/site_engagement_score_unittest.cc", | 3129 "../browser/engagement/site_engagement_score_unittest.cc", |
| 3127 "../browser/engagement/site_engagement_service_unittest.cc", | 3130 "../browser/engagement/site_engagement_service_unittest.cc", |
| 3128 "../browser/external_protocol/external_protocol_handler_unittest.cc", | |
|
tapted
2017/01/04 23:32:49
why remove this?
dominickn
2017/01/04 23:51:36
Oops! My new test was originally a unit test, so I
| |
| 3129 "../browser/favicon/chrome_fallback_icon_client_unittest.cc", | 3131 "../browser/favicon/chrome_fallback_icon_client_unittest.cc", |
| 3130 "../browser/file_select_helper_unittest.cc", | 3132 "../browser/file_select_helper_unittest.cc", |
| 3131 "../browser/geolocation/geolocation_permission_context_unittest.cc", | 3133 "../browser/geolocation/geolocation_permission_context_unittest.cc", |
| 3132 "../browser/global_keyboard_shortcuts_mac_unittest.mm", | 3134 "../browser/global_keyboard_shortcuts_mac_unittest.mm", |
| 3133 "../browser/google/google_update_settings_unittest.cc", | 3135 "../browser/google/google_update_settings_unittest.cc", |
| 3134 "../browser/google/google_update_win_unittest.cc", | 3136 "../browser/google/google_update_win_unittest.cc", |
| 3135 "../browser/history/android/android_cache_database_unittest.cc", | 3137 "../browser/history/android/android_cache_database_unittest.cc", |
| 3136 "../browser/history/android/android_history_provider_service_unittest.cc", | 3138 "../browser/history/android/android_history_provider_service_unittest.cc", |
| 3137 "../browser/history/android/android_provider_backend_unittest.cc", | 3139 "../browser/history/android/android_provider_backend_unittest.cc", |
| 3138 "../browser/history/android/android_urls_database_unittest.cc", | 3140 "../browser/history/android/android_urls_database_unittest.cc", |
| (...skipping 1960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5099 } | 5101 } |
| 5100 | 5102 |
| 5101 if (is_win) { | 5103 if (is_win) { |
| 5102 loadable_module("conflicts_dll") { | 5104 loadable_module("conflicts_dll") { |
| 5103 testonly = true | 5105 testonly = true |
| 5104 sources = [ | 5106 sources = [ |
| 5105 "conflicts/conflicts_dll.cc", | 5107 "conflicts/conflicts_dll.cc", |
| 5106 ] | 5108 ] |
| 5107 } | 5109 } |
| 5108 } | 5110 } |
| OLD | NEW |