Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 1228863005: [MediaRouter] The minimal change to make everything build on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved MRDC::GetOrCreateForWebContents to its own .cc file Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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 'variables': { 5 'variables': {
6 'chrome_unit_tests_sources': [ 6 'chrome_unit_tests_sources': [
7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this 7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
8 # dependency is needed to make commit bots run unit_tests on 8 # dependency is needed to make commit bots run unit_tests on
9 # histograms.xml changes. 9 # histograms.xml changes.
10 '../tools/metrics/histograms/histograms.xml', 10 '../tools/metrics/histograms/histograms.xml',
(...skipping 1450 matching lines...) Expand 10 before | Expand all | Expand 10 after
1461 'browser/supervised_user/legacy/supervised_user_registration_utility_unitt est.cc', 1461 'browser/supervised_user/legacy/supervised_user_registration_utility_unitt est.cc',
1462 'browser/supervised_user/legacy/supervised_user_shared_settings_service_un ittest.cc', 1462 'browser/supervised_user/legacy/supervised_user_shared_settings_service_un ittest.cc',
1463 'browser/supervised_user/legacy/supervised_user_shared_settings_update_uni ttest.cc', 1463 'browser/supervised_user/legacy/supervised_user_shared_settings_update_uni ttest.cc',
1464 'browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc', 1464 'browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc',
1465 ], 1465 ],
1466 'chrome_unit_tests_media_router_sources': [ 1466 'chrome_unit_tests_media_router_sources': [
1467 'browser/media/router/create_session_request_unittest.cc', 1467 'browser/media/router/create_session_request_unittest.cc',
1468 'browser/media/router/issue_manager_unittest.cc', 1468 'browser/media/router/issue_manager_unittest.cc',
1469 'browser/media/router/issue_unittest.cc', 1469 'browser/media/router/issue_unittest.cc',
1470 'browser/media/router/media_route_unittest.cc', 1470 'browser/media/router/media_route_unittest.cc',
1471 'browser/media/router/media_router_mojo_impl_unittest.cc',
1472 'browser/media/router/media_router_type_converters_unittest.cc',
1473 'browser/media/router/media_sink_unittest.cc', 1471 'browser/media/router/media_sink_unittest.cc',
1474 'browser/media/router/media_source_helper_unittest.cc', 1472 'browser/media/router/media_source_helper_unittest.cc',
1475 'browser/media/router/media_source_unittest.cc', 1473 'browser/media/router/media_source_unittest.cc',
1476 'browser/media/router/presentation_media_sinks_observer_unittest.cc', 1474 'browser/media/router/presentation_media_sinks_observer_unittest.cc',
1477 'browser/media/router/presentation_service_delegate_impl_unittest.cc', 1475 'browser/media/router/presentation_service_delegate_impl_unittest.cc',
1478 'browser/media/router/presentation_session_state_observer_unittest.cc', 1476 'browser/media/router/presentation_session_state_observer_unittest.cc',
1477 ],
1478 'chrome_unit_tests_media_router_non_android_sources': [
1479 'browser/media/router/media_router_mojo_impl_unittest.cc',
1480 'browser/media/router/media_router_type_converters_unittest.cc',
1479 'browser/ui/webui/media_router/media_cast_mode_unittest.cc', 1481 'browser/ui/webui/media_router/media_cast_mode_unittest.cc',
1480 'browser/ui/webui/media_router/media_router_dialog_controller_unittest.cc' , 1482 'browser/ui/webui/media_router/media_router_dialog_controller_impl_unittes t.cc',
1481 'browser/ui/webui/media_router/media_router_test.cc', 1483 'browser/ui/webui/media_router/media_router_test.cc',
1482 'browser/ui/webui/media_router/media_router_test.h', 1484 'browser/ui/webui/media_router/media_router_test.h',
1483 'browser/ui/webui/media_router/media_router_webui_message_handler_unittest .cc', 1485 'browser/ui/webui/media_router/media_router_webui_message_handler_unittest .cc',
1484 'browser/ui/webui/media_router/query_result_manager_unittest.cc', 1486 'browser/ui/webui/media_router/query_result_manager_unittest.cc',
1485 ], 1487 ],
1486 # Everything but Android and iOS (iOS is handled separately). 1488 # Everything but Android and iOS (iOS is handled separately).
1487 'chrome_unit_tests_non_android_sources': [ 1489 'chrome_unit_tests_non_android_sources': [
1488 # Bookmark export/import are handled via the BookmarkColumns 1490 # Bookmark export/import are handled via the BookmarkColumns
1489 # ContentProvider. 1491 # ContentProvider.
1490 'browser/bookmarks/bookmark_html_writer_unittest.cc', 1492 'browser/bookmarks/bookmark_html_writer_unittest.cc',
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
2433 }], 2435 }],
2434 ['enable_plugins==1', { 2436 ['enable_plugins==1', {
2435 'sources': [ '<@(chrome_unit_tests_plugins_sources)' ], 2437 'sources': [ '<@(chrome_unit_tests_plugins_sources)' ],
2436 }], 2438 }],
2437 ['enable_print_preview==1', { 2439 ['enable_print_preview==1', {
2438 'sources': [ '<@(chrome_unit_tests_print_preview_sources)' ], 2440 'sources': [ '<@(chrome_unit_tests_print_preview_sources)' ],
2439 }], 2441 }],
2440 ['enable_media_router==1', { 2442 ['enable_media_router==1', {
2441 'sources': [ '<@(chrome_unit_tests_media_router_sources)' ], 2443 'sources': [ '<@(chrome_unit_tests_media_router_sources)' ],
2442 'dependencies': [ 'browser/media/router/media_router.gyp:media_router_ test_support' ], 2444 'dependencies': [ 'browser/media/router/media_router.gyp:media_router_ test_support' ],
2445 'conditions': [
2446 ['OS!="android"', {
2447 'sources': [ '<@(chrome_unit_tests_media_router_non_android_source s)' ],
2448 }],
2449 ],
2443 }], 2450 }],
2444 ['enable_captive_portal_detection==1', { 2451 ['enable_captive_portal_detection==1', {
2445 'sources': [ '<@(chrome_unit_tests_captive_portal_sources)' ], 2452 'sources': [ '<@(chrome_unit_tests_captive_portal_sources)' ],
2446 }], 2453 }],
2447 ['enable_session_service==1', { 2454 ['enable_session_service==1', {
2448 'sources': [ '<@(chrome_unit_tests_session_service_sources)' ], 2455 'sources': [ '<@(chrome_unit_tests_session_service_sources)' ],
2449 }], 2456 }],
2450 ['enable_webrtc==1', { 2457 ['enable_webrtc==1', {
2451 'sources': [ '<@(chrome_unit_tests_webrtc_sources)' ], 2458 'sources': [ '<@(chrome_unit_tests_webrtc_sources)' ],
2452 }], 2459 }],
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
2892 'dependencies': [ 2899 'dependencies': [
2893 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2900 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2894 ], 2901 ],
2895 }], 2902 }],
2896 ], 2903 ],
2897 }, 2904 },
2898 ], 2905 ],
2899 }], 2906 }],
2900 ], # 'conditions' 2907 ], # 'conditions'
2901 } 2908 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698