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 4409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4420 "//printing:test_support", | 4420 "//printing:test_support", |
| 4421 ] | 4421 ] |
| 4422 } | 4422 } |
| 4423 | 4423 |
| 4424 if (enable_media_router) { | 4424 if (enable_media_router) { |
| 4425 sources += [ | 4425 sources += [ |
| 4426 "../browser/media/android/router/media_router_android_unittest.cc", | 4426 "../browser/media/android/router/media_router_android_unittest.cc", |
| 4427 "../browser/media/cast_remoting_connector_unittest.cc", | 4427 "../browser/media/cast_remoting_connector_unittest.cc", |
| 4428 "../browser/media/router/browser_presentation_connection_proxy_unittest.cc ", | 4428 "../browser/media/router/browser_presentation_connection_proxy_unittest.cc ", |
| 4429 "../browser/media/router/create_presentation_connection_request_unittest.c c", | 4429 "../browser/media/router/create_presentation_connection_request_unittest.c c", |
| 4430 "../browser/media/router/discovery/media_sink_internal_unittest.cc", | |
| 4431 "../browser/media/router/issue_manager_unittest.cc", | 4430 "../browser/media/router/issue_manager_unittest.cc", |
| 4432 "../browser/media/router/issue_unittest.cc", | |
| 4433 "../browser/media/router/media_route_unittest.cc", | |
| 4434 "../browser/media/router/media_router_base_unittest.cc", | 4431 "../browser/media/router/media_router_base_unittest.cc", |
| 4435 "../browser/media/router/media_router_dialog_controller_unittest.cc", | 4432 "../browser/media/router/media_router_dialog_controller_unittest.cc", |
| 4436 "../browser/media/router/media_router_factory_unittest.cc", | 4433 "../browser/media/router/media_router_factory_unittest.cc", |
| 4437 "../browser/media/router/media_router_metrics_unittest.cc", | 4434 "../browser/media/router/media_router_metrics_unittest.cc", |
| 4438 "../browser/media/router/media_sink_unittest.cc", | |
| 4439 "../browser/media/router/media_sinks_observer_unittest.cc", | 4435 "../browser/media/router/media_sinks_observer_unittest.cc", |
| 4440 "../browser/media/router/media_source_helper_unittest.cc", | |
| 4441 "../browser/media/router/media_source_unittest.cc", | |
| 4442 "../browser/media/router/offscreen_presentation_manager_factory_unittest.c c", | 4436 "../browser/media/router/offscreen_presentation_manager_factory_unittest.c c", |
| 4443 "../browser/media/router/offscreen_presentation_manager_unittest.cc", | 4437 "../browser/media/router/offscreen_presentation_manager_unittest.cc", |
| 4444 "../browser/media/router/presentation_media_sinks_observer_unittest.cc", | 4438 "../browser/media/router/presentation_media_sinks_observer_unittest.cc", |
| 4445 "../browser/media/router/presentation_request_unittest.cc", | 4439 "../browser/media/router/presentation_request_unittest.cc", |
| 4446 "../browser/media/router/presentation_service_delegate_impl_unittest.cc", | 4440 "../browser/media/router/presentation_service_delegate_impl_unittest.cc", |
| 4441 "../common/media_router/discovery/media_sink_internal_unittest.cc", | |
| 4442 "../common/media_router/issue_unittest.cc", | |
| 4443 "../common/media_router/media_route_unittest.cc", | |
| 4444 "../common/media_router/media_sink_unittest.cc", | |
| 4445 "../common/media_router/media_source_helper_unittest.cc", | |
| 4446 "../common/media_router/media_source_unittest.cc", | |
|
Nico
2017/04/20 14:57:49
These 6 files are listed both here and in https://
takumif
2017/04/20 18:15:35
No, I'll remove them from the other file.
takumif
2017/04/20 21:04:45
Landed a fix:
https://codereview.chromium.org/2834
| |
| 4447 ] | 4447 ] |
| 4448 deps += [ "//chrome/browser/media/router:test_support" ] | 4448 deps += [ "//chrome/browser/media/router:test_support" ] |
| 4449 if (!is_android) { | 4449 if (!is_android) { |
| 4450 sources += [ | 4450 sources += [ |
| 4451 "../browser/media/router/discovery/dial/device_description_fetcher_unitt est.cc", | 4451 "../browser/media/router/discovery/dial/device_description_fetcher_unitt est.cc", |
| 4452 "../browser/media/router/discovery/dial/dial_device_data_unittest.cc", | 4452 "../browser/media/router/discovery/dial/dial_device_data_unittest.cc", |
| 4453 "../browser/media/router/discovery/dial/dial_registry_unittest.cc", | 4453 "../browser/media/router/discovery/dial/dial_registry_unittest.cc", |
| 4454 "../browser/media/router/discovery/dial/dial_service_unittest.cc", | 4454 "../browser/media/router/discovery/dial/dial_service_unittest.cc", |
| 4455 | 4455 |
| 4456 # TODO(crbug.com/646627): | 4456 # TODO(crbug.com/646627): |
| 4457 # Move media_router_ui_service_factory_unittest.cc to chrome/browser/ui. | 4457 # Move media_router_ui_service_factory_unittest.cc to chrome/browser/ui. |
| 4458 "../browser/media/router/media_router_ui_service_factory_unittest.cc", | 4458 "../browser/media/router/media_router_ui_service_factory_unittest.cc", |
| 4459 "../browser/media/router/mojo/media_route_controller_unittest.cc", | 4459 "../browser/media/router/mojo/media_route_controller_unittest.cc", |
| 4460 "../browser/media/router/mojo/media_router_mojo_impl_unittest.cc", | 4460 "../browser/media/router/mojo/media_router_mojo_impl_unittest.cc", |
| 4461 "../browser/media/router/mojo/media_router_mojo_metrics_unittest.cc", | 4461 "../browser/media/router/mojo/media_router_mojo_metrics_unittest.cc", |
| 4462 "../browser/media/router/mojo/media_router_struct_traits_unittest.cc", | |
| 4463 "../browser/ui/toolbar/media_router_action_controller_unittest.cc", | 4462 "../browser/ui/toolbar/media_router_action_controller_unittest.cc", |
| 4464 "../browser/ui/toolbar/media_router_action_unittest.cc", | 4463 "../browser/ui/toolbar/media_router_action_unittest.cc", |
| 4465 "../browser/ui/toolbar/media_router_contextual_menu_unittest.cc", | 4464 "../browser/ui/toolbar/media_router_contextual_menu_unittest.cc", |
| 4466 "../browser/ui/toolbar/mock_media_router_action_controller.cc", | 4465 "../browser/ui/toolbar/mock_media_router_action_controller.cc", |
| 4467 "../browser/ui/toolbar/mock_media_router_action_controller.h", | 4466 "../browser/ui/toolbar/mock_media_router_action_controller.h", |
| 4468 "../browser/ui/webui/media_router/cast_modes_with_media_sources_unittest .cc", | 4467 "../browser/ui/webui/media_router/cast_modes_with_media_sources_unittest .cc", |
| 4469 "../browser/ui/webui/media_router/media_cast_mode_unittest.cc", | 4468 "../browser/ui/webui/media_router/media_cast_mode_unittest.cc", |
| 4470 "../browser/ui/webui/media_router/media_router_dialog_controller_impl_un ittest.cc", | 4469 "../browser/ui/webui/media_router/media_router_dialog_controller_impl_un ittest.cc", |
| 4471 "../browser/ui/webui/media_router/media_router_ui_unittest.cc", | 4470 "../browser/ui/webui/media_router/media_router_ui_unittest.cc", |
| 4472 "../browser/ui/webui/media_router/media_router_web_ui_test.cc", | 4471 "../browser/ui/webui/media_router/media_router_web_ui_test.cc", |
| 4473 "../browser/ui/webui/media_router/media_router_web_ui_test.h", | 4472 "../browser/ui/webui/media_router/media_router_web_ui_test.h", |
| 4474 "../browser/ui/webui/media_router/media_router_webui_message_handler_uni ttest.cc", | 4473 "../browser/ui/webui/media_router/media_router_webui_message_handler_uni ttest.cc", |
| 4475 "../browser/ui/webui/media_router/query_result_manager_unittest.cc", | 4474 "../browser/ui/webui/media_router/query_result_manager_unittest.cc", |
| 4475 "../common/media_router/mojo/media_router_struct_traits_unittest.cc", | |
|
Nico
2017/04/20 15:00:57
This one too is listed in both places.
takumif
2017/04/20 18:15:36
Acknowledged.
| |
| 4476 "../utility/media_router/dial_device_description_parser_impl_unittest.cc ", | 4476 "../utility/media_router/dial_device_description_parser_impl_unittest.cc ", |
| 4477 ] | 4477 ] |
| 4478 } | 4478 } |
| 4479 } | 4479 } |
| 4480 if (enable_captive_portal_detection) { | 4480 if (enable_captive_portal_detection) { |
| 4481 sources += [ | 4481 sources += [ |
| 4482 "../browser/captive_portal/captive_portal_service_unittest.cc", | 4482 "../browser/captive_portal/captive_portal_service_unittest.cc", |
| 4483 "../browser/captive_portal/captive_portal_tab_helper_unittest.cc", | 4483 "../browser/captive_portal/captive_portal_tab_helper_unittest.cc", |
| 4484 "../browser/captive_portal/captive_portal_tab_reloader_unittest.cc", | 4484 "../browser/captive_portal/captive_portal_tab_reloader_unittest.cc", |
| 4485 ] | 4485 ] |
| (...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5241 } | 5241 } |
| 5242 | 5242 |
| 5243 if (is_win) { | 5243 if (is_win) { |
| 5244 loadable_module("conflicts_dll") { | 5244 loadable_module("conflicts_dll") { |
| 5245 testonly = true | 5245 testonly = true |
| 5246 sources = [ | 5246 sources = [ |
| 5247 "conflicts/conflicts_dll.cc", | 5247 "conflicts/conflicts_dll.cc", |
| 5248 ] | 5248 ] |
| 5249 } | 5249 } |
| 5250 } | 5250 } |
| OLD | NEW |