| OLD | NEW | 
|     1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |     1 # Copyright (c) 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 { |     5 { | 
|     6   'targets': [ |     6   'targets': [ | 
|     7     { |     7     { | 
|     8       'target_name': 'test_support_content', |     8       'target_name': 'test_support_content', | 
|     9       'type': 'static_library', |     9       'type': 'static_library', | 
|    10       'defines!': ['CONTENT_IMPLEMENTATION'], |    10       'defines!': ['CONTENT_IMPLEMENTATION'], | 
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   287         'browser/geolocation/win7_location_api_unittest_win.cc', |   287         'browser/geolocation/win7_location_api_unittest_win.cc', | 
|   288         'browser/geolocation/win7_location_provider_unittest_win.cc', |   288         'browser/geolocation/win7_location_provider_unittest_win.cc', | 
|   289         'browser/gpu/gpu_blacklist_unittest.cc', |   289         'browser/gpu/gpu_blacklist_unittest.cc', | 
|   290         'browser/gpu/gpu_data_manager_impl_unittest.cc', |   290         'browser/gpu/gpu_data_manager_impl_unittest.cc', | 
|   291         'browser/gpu/gpu_util_unittest.cc', |   291         'browser/gpu/gpu_util_unittest.cc', | 
|   292         'browser/host_zoom_map_impl_unittest.cc', |   292         'browser/host_zoom_map_impl_unittest.cc', | 
|   293         'browser/hyphenator/hyphenator_message_filter_unittest.cc', |   293         'browser/hyphenator/hyphenator_message_filter_unittest.cc', | 
|   294         'browser/in_process_webkit/indexed_db_quota_client_unittest.cc', |   294         'browser/in_process_webkit/indexed_db_quota_client_unittest.cc', | 
|   295         'browser/in_process_webkit/indexed_db_unittest.cc', |   295         'browser/in_process_webkit/indexed_db_unittest.cc', | 
|   296         'browser/in_process_webkit/webkit_thread_unittest.cc', |   296         'browser/in_process_webkit/webkit_thread_unittest.cc', | 
|   297         'browser/intents/intent_injector_unittest.cc', |  | 
|   298         'browser/intents/internal_web_intents_dispatcher_unittest.cc', |  | 
|   299         'browser/loader/resource_buffer_unittest.cc', |   297         'browser/loader/resource_buffer_unittest.cc', | 
|   300         'browser/loader/resource_dispatcher_host_unittest.cc', |   298         'browser/loader/resource_dispatcher_host_unittest.cc', | 
|   301         'browser/loader/resource_loader_unittest.cc', |   299         'browser/loader/resource_loader_unittest.cc', | 
|   302         'browser/mach_broker_mac_unittest.cc', |   300         'browser/mach_broker_mac_unittest.cc', | 
|   303         'browser/media/media_internals_unittest.cc', |   301         'browser/media/media_internals_unittest.cc', | 
|   304         'browser/media/webrtc_internals_unittest.cc', |   302         'browser/media/webrtc_internals_unittest.cc', | 
|   305         'browser/notification_service_impl_unittest.cc', |   303         'browser/notification_service_impl_unittest.cc', | 
|   306         'browser/plugin_loader_posix_unittest.cc', |   304         'browser/plugin_loader_posix_unittest.cc', | 
|   307         'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', |   305         'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', | 
|   308         'browser/renderer_host/media/audio_input_device_manager_unittest.cc', |   306         'browser/renderer_host/media/audio_input_device_manager_unittest.cc', | 
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   560             'renderer/media/webrtc_audio_device_unittest.cc', |   558             'renderer/media/webrtc_audio_device_unittest.cc', | 
|   561           ], |   559           ], | 
|   562           'dependencies': [ |   560           'dependencies': [ | 
|   563             '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection', |   561             '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection', | 
|   564             '../third_party/webrtc/modules/modules.gyp:video_capture_module', |   562             '../third_party/webrtc/modules/modules.gyp:video_capture_module', | 
|   565             '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:sy
      stem_wrappers', |   563             '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:sy
      stem_wrappers', | 
|   566             '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_co
      re', |   564             '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_co
      re', | 
|   567             '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_co
      re', |   565             '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_co
      re', | 
|   568           ] |   566           ] | 
|   569         }], |   567         }], | 
|   570         ['enable_web_intents==0', { |  | 
|   571           'sources!': [ |  | 
|   572             'browser/intents/intent_injector_unittest.cc', |  | 
|   573             'browser/intents/internal_web_intents_dispatcher_unittest.cc', |  | 
|   574           ], |  | 
|   575         }], |  | 
|   576         # TODO(jrg): remove the OS=="android" section? |   568         # TODO(jrg): remove the OS=="android" section? | 
|   577         # http://crbug.com/113172 |   569         # http://crbug.com/113172 | 
|   578         # Understand better how media_stream_ is tied into Chromium. |   570         # Understand better how media_stream_ is tied into Chromium. | 
|   579         ['enable_webrtc==0 and OS=="android"', { |   571         ['enable_webrtc==0 and OS=="android"', { | 
|   580           'sources/': [ |   572           'sources/': [ | 
|   581             ['exclude', '^renderer/media/media_stream_'], |   573             ['exclude', '^renderer/media/media_stream_'], | 
|   582           ], |   574           ], | 
|   583         }], |   575         }], | 
|   584         ['input_speech==0', { |   576         ['input_speech==0', { | 
|   585           'sources/': [ |   577           'sources/': [ | 
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   753             'renderer/browser_plugin/browser_plugin_browsertest.h', |   745             'renderer/browser_plugin/browser_plugin_browsertest.h', | 
|   754             'renderer/browser_plugin/browser_plugin_browsertest.cc', |   746             'renderer/browser_plugin/browser_plugin_browsertest.cc', | 
|   755             'renderer/mouse_lock_dispatcher_browsertest.cc', |   747             'renderer/mouse_lock_dispatcher_browsertest.cc', | 
|   756             'renderer/pepper/mock_renderer_ppapi_host.cc', |   748             'renderer/pepper/mock_renderer_ppapi_host.cc', | 
|   757             'renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc', |   749             'renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc', | 
|   758             'renderer/pepper/pepper_file_chooser_host_unittest.cc', |   750             'renderer/pepper/pepper_file_chooser_host_unittest.cc', | 
|   759             'renderer/pepper/pepper_url_request_unittest.cc', |   751             'renderer/pepper/pepper_url_request_unittest.cc', | 
|   760             'renderer/render_view_browsertest.cc', |   752             'renderer/render_view_browsertest.cc', | 
|   761             'renderer/render_view_browsertest_mac.mm', |   753             'renderer/render_view_browsertest_mac.mm', | 
|   762             'renderer/render_widget_browsertest.cc', |   754             'renderer/render_widget_browsertest.cc', | 
|   763             'renderer/web_intents_host_browsertest.cc', |  | 
|   764             'test/browser_test_message_pump_android.cc', |   755             'test/browser_test_message_pump_android.cc', | 
|   765             'test/browser_test_message_pump_android.h', |   756             'test/browser_test_message_pump_android.h', | 
|   766             'test/content_browser_test.h', |   757             'test/content_browser_test.h', | 
|   767             'test/content_browser_test.cc', |   758             'test/content_browser_test.cc', | 
|   768             'test/content_browser_test_utils.cc', |   759             'test/content_browser_test_utils.cc', | 
|   769             'test/content_browser_test_utils.h', |   760             'test/content_browser_test_utils.h', | 
|   770             'test/content_browser_test_utils_mac.mm', |   761             'test/content_browser_test_utils_mac.mm', | 
|   771             'test/content_browser_test_test.cc', |   762             'test/content_browser_test_test.cc', | 
|   772             'test/content_test_launcher.cc', |   763             'test/content_test_launcher.cc', | 
|   773             'test/layout_browsertest.cc', |   764             'test/layout_browsertest.cc', | 
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   868                 # Runtime dependencies |   859                 # Runtime dependencies | 
|   869                 '../webkit/webkit.gyp:copy_npapi_test_plugin', |   860                 '../webkit/webkit.gyp:copy_npapi_test_plugin', | 
|   870                 '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn', |   861                 '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn', | 
|   871               ], |   862               ], | 
|   872             }], |   863             }], | 
|   873             ['enable_webrtc==1', { |   864             ['enable_webrtc==1', { | 
|   874               'sources': [ |   865               'sources': [ | 
|   875                 'browser/media/webrtc_browsertest.cc', |   866                 'browser/media/webrtc_browsertest.cc', | 
|   876               ], |   867               ], | 
|   877             }], |   868             }], | 
|   878             ['enable_web_intents==0', { |  | 
|   879               'sources!': [ |  | 
|   880                 'renderer/web_intents_host_browsertest.cc', |  | 
|   881               ], |  | 
|   882             }], |  | 
|   883             ['enable_plugins==0', { |   869             ['enable_plugins==0', { | 
|   884               'sources!': [ |   870               'sources!': [ | 
|   885                 'browser/plugin_service_impl_browsertest.cc', |   871                 'browser/plugin_service_impl_browsertest.cc', | 
|   886                 'browser/plugin_data_remover_impl_browsertest.cc', |   872                 'browser/plugin_data_remover_impl_browsertest.cc', | 
|   887                 'renderer/pepper/pepper_device_enumeration_host_helper_unittest.
      cc', |   873                 'renderer/pepper/pepper_device_enumeration_host_helper_unittest.
      cc', | 
|   888                 'renderer/pepper/pepper_file_chooser_host_unittest.cc', |   874                 'renderer/pepper/pepper_file_chooser_host_unittest.cc', | 
|   889               ], |   875               ], | 
|   890             }], |   876             }], | 
|   891             ['input_speech==0', { |   877             ['input_speech==0', { | 
|   892               'sources/': [ |   878               'sources/': [ | 
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1047             'additional_src_dirs': ['../content/public/android/javatests/',], |  1033             'additional_src_dirs': ['../content/public/android/javatests/',], | 
|  1048             'resource_dir': '../shell_apk/res', |  1034             'resource_dir': '../shell_apk/res', | 
|  1049             'is_test_apk': 1, |  1035             'is_test_apk': 1, | 
|  1050           }, |  1036           }, | 
|  1051           'includes': [ '../build/java_apk.gypi' ], |  1037           'includes': [ '../build/java_apk.gypi' ], | 
|  1052         }, |  1038         }, | 
|  1053       ], |  1039       ], | 
|  1054     }], |  1040     }], | 
|  1055   ], |  1041   ], | 
|  1056 } |  1042 } | 
| OLD | NEW |