| Index: chrome/chrome_tests.gypi
|
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
|
| index 049c72397e8d217246348cc95d8a44afdeb1bbff..aeb1f60553807fcf60af1606451e356cf5119a65 100644
|
| --- a/chrome/chrome_tests.gypi
|
| +++ b/chrome/chrome_tests.gypi
|
| @@ -258,8 +258,8 @@
|
| 'browser/extensions/extension_startup_browsertest.cc',
|
| 'browser/extensions/extension_storage_apitest.cc',
|
| 'browser/extensions/extension_storage_monitor_browsertest.cc',
|
| - 'browser/extensions/extension_tabs_apitest.cc',
|
| 'browser/extensions/extension_tab_util_browsertest.cc',
|
| + 'browser/extensions/extension_tabs_apitest.cc',
|
| 'browser/extensions/extension_url_rewrite_browsertest.cc',
|
| 'browser/extensions/extension_view_host_factory_browsertest.cc',
|
| 'browser/extensions/extension_websocket_apitest.cc',
|
| @@ -317,25 +317,19 @@
|
| 'browser/lifetime/browser_close_manager_browsertest.cc',
|
| 'browser/loadtimes_extension_bindings_browsertest.cc',
|
| 'browser/locale_tests_browsertest.cc',
|
| - 'browser/media/chrome_media_stream_infobar_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_apprtc_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_audio_quality_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_getmediadevices_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_perf_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_simulcast_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_video_quality_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_webcam_browsertest.cc',
|
| 'browser/media/defer_background_media_browsertest.cc',
|
| 'browser/media/encrypted_media_browsertest.cc',
|
| 'browser/media/encrypted_media_supported_types_browsertest.cc',
|
| 'browser/media/media_browsertest.cc',
|
| 'browser/media/media_browsertest.h',
|
| 'browser/media/media_stream_devices_controller_browsertest.cc',
|
| + 'browser/media/media_stream_infobar_browsertest.cc',
|
| 'browser/media/test_license_server.cc',
|
| 'browser/media/test_license_server.h',
|
| 'browser/media/test_license_server_config.h',
|
| + 'browser/media/webrtc_apprtc_browsertest.cc',
|
| + 'browser/media/webrtc_audio_quality_browsertest.cc',
|
| + 'browser/media/webrtc_browsertest.cc',
|
| 'browser/media/webrtc_browsertest_audio.cc',
|
| 'browser/media/webrtc_browsertest_audio.h',
|
| 'browser/media/webrtc_browsertest_base.cc',
|
| @@ -344,6 +338,12 @@
|
| 'browser/media/webrtc_browsertest_common.h',
|
| 'browser/media/webrtc_browsertest_perf.cc',
|
| 'browser/media/webrtc_browsertest_perf.h',
|
| + 'browser/media/webrtc_disable_encryption_flag_browsertest.cc',
|
| + 'browser/media/webrtc_getmediadevices_browsertest.cc',
|
| + 'browser/media/webrtc_perf_browsertest.cc',
|
| + 'browser/media/webrtc_simulcast_browsertest.cc',
|
| + 'browser/media/webrtc_video_quality_browsertest.cc',
|
| + 'browser/media/webrtc_webcam_browsertest.cc',
|
| 'browser/media/wv_test_license_server_config.cc',
|
| 'browser/media/wv_test_license_server_config.h',
|
| 'browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc',
|
| @@ -387,14 +387,14 @@
|
| 'browser/profiles/profile_window_browsertest.cc',
|
| 'browser/push_messaging/push_messaging_browsertest.cc',
|
| 'browser/referrer_policy_browsertest.cc',
|
| + 'browser/renderer_context_menu/mock_render_view_context_menu.cc',
|
| + 'browser/renderer_context_menu/mock_render_view_context_menu.h',
|
| 'browser/renderer_context_menu/render_view_context_menu_browsertest.cc',
|
| 'browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc',
|
| 'browser/renderer_context_menu/render_view_context_menu_browsertest_util.h',
|
| 'browser/renderer_context_menu/render_view_context_menu_test_util.cc',
|
| 'browser/renderer_context_menu/render_view_context_menu_test_util.h',
|
| 'browser/renderer_context_menu/spelling_menu_observer_browsertest.cc',
|
| - 'browser/renderer_context_menu/mock_render_view_context_menu.cc',
|
| - 'browser/renderer_context_menu/mock_render_view_context_menu.h',
|
| 'browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc',
|
| 'browser/renderer_host/render_process_host_chrome_browsertest.cc',
|
| 'browser/repost_form_warning_browsertest.cc',
|
| @@ -675,6 +675,8 @@
|
| 'browser/ui/views/web_dialog_view_browsertest.cc',
|
| ],
|
| 'chrome_browser_tests_chromeos_sources': [
|
| + '../ui/base/ime/chromeos/input_method_whitelist.cc',
|
| + '../ui/base/ime/chromeos/input_method_whitelist.h',
|
| 'browser/apps/custom_launcher_page_browsertest_views.cc',
|
| 'browser/chromeos/accessibility/accessibility_manager_browsertest.cc',
|
| 'browser/chromeos/accessibility/magnification_manager_browsertest.cc',
|
| @@ -837,8 +839,6 @@
|
| 'browser/ui/webui/options/chromeos/guest_mode_options_browsertest.cc',
|
| 'browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc',
|
| 'browser/ui/webui/options/chromeos/shared_options_browsertest.cc',
|
| - '../ui/base/ime/chromeos/input_method_whitelist.h',
|
| - '../ui/base/ime/chromeos/input_method_whitelist.cc',
|
| ],
|
| 'chrome_browser_tests_views_non_cros_or_mac_sources': [
|
| # This should be brought up on OSX Views but not CrOS.
|
| @@ -1087,8 +1087,8 @@
|
| 'test/base/interactive_test_utils.h',
|
| 'test/base/interactive_test_utils_aura.cc',
|
| 'test/base/interactive_test_utils_aura.h',
|
| - 'test/base/interactive_test_utils_mac.mm',
|
| 'test/base/interactive_test_utils_common_views.cc',
|
| + 'test/base/interactive_test_utils_mac.mm',
|
| 'test/base/interactive_test_utils_win.cc',
|
| 'test/base/interactive_ui_tests_main.cc',
|
| 'test/base/view_event_test_platform_part.h',
|
| @@ -2447,15 +2447,15 @@
|
| 'sources!': [
|
| 'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc',
|
| 'browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc',
|
| - 'browser/media/chrome_webrtc_apprtc_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_audio_quality_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_getmediadevices_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_perf_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_simulcast_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_video_quality_browsertest.cc',
|
| - 'browser/media/chrome_webrtc_webcam_browsertest.cc',
|
| + 'browser/media/webrtc_apprtc_browsertest.cc',
|
| + 'browser/media/webrtc_audio_quality_browsertest.cc',
|
| + 'browser/media/webrtc_browsertest.cc',
|
| + 'browser/media/webrtc_disable_encryption_flag_browsertest.cc',
|
| + 'browser/media/webrtc_getmediadevices_browsertest.cc',
|
| + 'browser/media/webrtc_perf_browsertest.cc',
|
| + 'browser/media/webrtc_simulcast_browsertest.cc',
|
| + 'browser/media/webrtc_video_quality_browsertest.cc',
|
| + 'browser/media/webrtc_webcam_browsertest.cc',
|
| ],
|
| }],
|
| ['OS=="win"', {
|
|
|