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 2533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2544 # Tests for non mobile and non CrOS (includes Linux, Win, Mac). | 2544 # Tests for non mobile and non CrOS (includes Linux, Win, Mac). |
| 2545 "../browser/metrics/desktop_session_duration/audible_contents_tracker_br owsertest.cc", | 2545 "../browser/metrics/desktop_session_duration/audible_contents_tracker_br owsertest.cc", |
| 2546 "../browser/metrics/desktop_session_duration/chrome_visibility_observer_ browsertest.cc", | 2546 "../browser/metrics/desktop_session_duration/chrome_visibility_observer_ browsertest.cc", |
| 2547 "../browser/profiles/profile_statistics_browsertest.cc", | 2547 "../browser/profiles/profile_statistics_browsertest.cc", |
| 2548 ] | 2548 ] |
| 2549 } | 2549 } |
| 2550 if (enable_app_list) { | 2550 if (enable_app_list) { |
| 2551 sources += [ | 2551 sources += [ |
| 2552 "../browser/apps/drive/drive_app_converter_browsertest.cc", | 2552 "../browser/apps/drive/drive_app_converter_browsertest.cc", |
| 2553 "../browser/apps/drive/drive_app_provider_browsertest.cc", | 2553 "../browser/apps/drive/drive_app_provider_browsertest.cc", |
| 2554 "../browser/ui/app_list/app_list_controller_browsertest.cc", | 2554 "../browser/ui/app_list/app_list_controller_browsertest.cc", |
|
tapted
2016/12/16 05:11:41
There are some #if (OS_CHROMEOS) in here
Matt Giuca
2016/12/21 06:18:03
Done.
| |
| 2555 "../browser/ui/app_list/app_list_service_impl_browsertest.cc", | 2555 "../browser/ui/app_list/app_list_service_impl_browsertest.cc", |
|
tapted
2016/12/16 05:11:41
There are lots (more) #if (OS_CHROMEOS) in this f
Matt Giuca
2016/12/21 06:18:03
Done.
| |
| 2556 "../browser/ui/app_list/app_list_service_views_browsertest.cc", | |
| 2557 "../browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc ", | 2556 "../browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc ", |
| 2558 "../browser/ui/app_list/speech_recognizer_browsertest.cc", | 2557 "../browser/ui/app_list/speech_recognizer_browsertest.cc", |
| 2559 ] | 2558 ] |
| 2560 if (is_mac) { | |
| 2561 # This assumes the AppList is views-based, but Mac only links | |
| 2562 # browser parts for the Cocoa implementation. | |
| 2563 sources -= | |
| 2564 [ "../browser/ui/app_list/app_list_service_views_browsertest.cc" ] | |
| 2565 } | |
| 2566 } | 2559 } |
| 2567 if (enable_service_discovery) { | 2560 if (enable_service_discovery) { |
| 2568 sources += [ "../browser/extensions/api/mdns/mdns_apitest.cc" ] | 2561 sources += [ "../browser/extensions/api/mdns/mdns_apitest.cc" ] |
| 2569 } | 2562 } |
| 2570 if (enable_supervised_users) { | 2563 if (enable_supervised_users) { |
| 2571 sources += [ | 2564 sources += [ |
| 2572 "../browser/supervised_user/supervised_user_browsertest.cc", | 2565 "../browser/supervised_user/supervised_user_browsertest.cc", |
| 2573 "../browser/supervised_user/supervised_user_resource_throttle_browsertes t.cc", | 2566 "../browser/supervised_user/supervised_user_resource_throttle_browsertes t.cc", |
| 2574 "../browser/supervised_user/supervised_user_service_browsertest.cc", | 2567 "../browser/supervised_user/supervised_user_service_browsertest.cc", |
| 2575 ] | 2568 ] |
| (...skipping 2249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4825 "../browser/ui/webui/signin/signin_supervised_user_import_handler_unittest .cc", | 4818 "../browser/ui/webui/signin/signin_supervised_user_import_handler_unittest .cc", |
| 4826 ] | 4819 ] |
| 4827 } | 4820 } |
| 4828 if (safe_browsing_mode == 1 && enable_extensions) { | 4821 if (safe_browsing_mode == 1 && enable_extensions) { |
| 4829 sources += [ "../browser/extensions/blacklist_unittest.cc" ] | 4822 sources += [ "../browser/extensions/blacklist_unittest.cc" ] |
| 4830 } | 4823 } |
| 4831 if (enable_app_list) { | 4824 if (enable_app_list) { |
| 4832 sources += [ | 4825 sources += [ |
| 4833 "../browser/apps/drive/drive_app_mapping_unittest.cc", | 4826 "../browser/apps/drive/drive_app_mapping_unittest.cc", |
| 4834 "../browser/ui/app_list/app_context_menu_unittest.cc", | 4827 "../browser/ui/app_list/app_context_menu_unittest.cc", |
| 4835 "../browser/ui/app_list/app_list_positioner_unittest.cc", | |
| 4836 "../browser/ui/app_list/app_list_service_unittest.cc", | 4828 "../browser/ui/app_list/app_list_service_unittest.cc", |
|
tapted
2016/12/16 05:11:41
This has some profile switching stuff that will pr
Matt Giuca
2016/12/21 06:18:03
Acknowledged.
| |
| 4837 "../browser/ui/app_list/app_list_test_util.cc", | 4829 "../browser/ui/app_list/app_list_test_util.cc", |
| 4838 "../browser/ui/app_list/app_list_test_util.h", | 4830 "../browser/ui/app_list/app_list_test_util.h", |
| 4839 "../browser/ui/app_list/extension_app_model_builder_unittest.cc", | 4831 "../browser/ui/app_list/extension_app_model_builder_unittest.cc", |
| 4840 "../browser/ui/app_list/profile_loader_unittest.cc", | 4832 "../browser/ui/app_list/profile_loader_unittest.cc", |
| 4841 "../browser/ui/app_list/search/app_search_provider_unittest.cc", | 4833 "../browser/ui/app_list/search/app_search_provider_unittest.cc", |
| 4842 "../browser/ui/app_list/search/history_unittest.cc", | 4834 "../browser/ui/app_list/search/history_unittest.cc", |
| 4843 "../browser/ui/app_list/search/omnibox_result_unittest.cc", | 4835 "../browser/ui/app_list/search/omnibox_result_unittest.cc", |
| 4844 "../browser/ui/app_list/search/suggestions/suggestions_search_provider_uni ttest.cc", | 4836 "../browser/ui/app_list/search/suggestions/suggestions_search_provider_uni ttest.cc", |
| 4845 "../browser/ui/app_list/speech_auth_helper_unittest.cc", | 4837 "../browser/ui/app_list/speech_auth_helper_unittest.cc", |
| 4846 "../browser/ui/app_list/test/fake_profile.cc", | 4838 "../browser/ui/app_list/test/fake_profile.cc", |
| 4847 "../browser/ui/app_list/test/fake_profile.h", | 4839 "../browser/ui/app_list/test/fake_profile.h", |
| 4848 "../browser/ui/app_list/test/fake_profile_store.cc", | 4840 "../browser/ui/app_list/test/fake_profile_store.cc", |
| 4849 "../browser/ui/app_list/test/fake_profile_store.h", | 4841 "../browser/ui/app_list/test/fake_profile_store.h", |
|
tapted
2016/12/16 05:11:41
All the fake_profile goop probably isn't needed ei
Matt Giuca
2016/12/21 06:18:03
Acknowledged.
| |
| 4850 "../browser/ui/app_list/test/fast_show_pickler_unittest.cc", | |
| 4851 "../browser/ui/views/app_list/linux/app_list_linux_unittest.cc", | |
| 4852 ] | 4842 ] |
| 4853 deps += [ "//ui/app_list:test_support" ] | 4843 deps += [ "//ui/app_list:test_support" ] |
| 4854 } | 4844 } |
| 4855 if (enable_app_list && is_chromeos) { | 4845 if (enable_app_list && is_chromeos) { |
|
tapted
2016/12/16 05:11:41
I guess this can be simplified in a follow-up?
Matt Giuca
2016/12/21 06:18:03
Done here.
| |
| 4856 sources += [ | 4846 sources += [ |
| 4857 "../browser/ui/app_list/arc/arc_app_test.cc", | 4847 "../browser/ui/app_list/arc/arc_app_test.cc", |
| 4858 "../browser/ui/app_list/arc/arc_app_test.h", | 4848 "../browser/ui/app_list/arc/arc_app_test.h", |
| 4859 "../browser/ui/app_list/arc/arc_app_unittest.cc", | 4849 "../browser/ui/app_list/arc/arc_app_unittest.cc", |
| 4860 "../browser/ui/app_list/search/launcher_search/launcher_search_icon_image_ loader_unittest.cc", | 4850 "../browser/ui/app_list/search/launcher_search/launcher_search_icon_image_ loader_unittest.cc", |
| 4861 "../browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc" , | 4851 "../browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc" , |
| 4862 ] | 4852 ] |
| 4863 sources -= | |
| 4864 [ "../browser/ui/views/app_list/linux/app_list_linux_unittest.cc" ] | |
| 4865 deps += [ "//components/arc:arc_test_support" ] | 4853 deps += [ "//components/arc:arc_test_support" ] |
| 4866 } | 4854 } |
| 4867 if (enable_plugins && !enable_plugin_installation) { | 4855 if (enable_plugins && !enable_plugin_installation) { |
| 4868 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ] | 4856 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ] |
| 4869 } | 4857 } |
| 4870 } | 4858 } |
| 4871 | 4859 |
| 4872 if (safe_browsing_mode == 1 && is_mac) { | 4860 if (safe_browsing_mode == 1 && is_mac) { |
| 4873 action("mac_safe_browsing_test_data") { | 4861 action("mac_safe_browsing_test_data") { |
| 4874 script = "//build/gn_run_binary.py" | 4862 script = "//build/gn_run_binary.py" |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5095 } | 5083 } |
| 5096 | 5084 |
| 5097 if (is_win) { | 5085 if (is_win) { |
| 5098 loadable_module("conflicts_dll") { | 5086 loadable_module("conflicts_dll") { |
| 5099 testonly = true | 5087 testonly = true |
| 5100 sources = [ | 5088 sources = [ |
| 5101 "conflicts/conflicts_dll.cc", | 5089 "conflicts/conflicts_dll.cc", |
| 5102 ] | 5090 ] |
| 5103 } | 5091 } |
| 5104 } | 5092 } |
| OLD | NEW |