Convert a bunch of test_shell_tests to content_browsertests. These are tests that depend on loading…

content/content_tests.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 286 matching lines @@
         'browser/gpu/gpu_data_manager_impl_unittest.cc',
         'browser/gpu/gpu_driver_bug_list_unittest.cc',
         'browser/gpu/gpu_switching_list_unittest.cc',
         'browser/gpu/gpu_util_unittest.cc',
         'browser/gpu/shader_disk_cache_unittest.cc',
         'browser/host_zoom_map_impl_unittest.cc',
         'browser/hyphenator/hyphenator_message_filter_unittest.cc',
         'browser/in_process_webkit/webkit_thread_unittest.cc',
         'browser/indexed_db/indexed_db_unittest.cc',
         'browser/indexed_db/indexed_db_quota_client_unittest.cc',
-        'browser/loader/offline_policy_unittest.cc',
+        'browser/loader/offline_policy_unittest.cc',
         'browser/loader/resource_buffer_unittest.cc',
         'browser/loader/resource_dispatcher_host_unittest.cc',
         'browser/loader/resource_loader_unittest.cc',
         'browser/loader/resource_scheduler_unittest.cc',
         'browser/mach_broker_mac_unittest.cc',
         'browser/media/media_internals_unittest.cc',
         'browser/media/webrtc_internals_unittest.cc',
         'browser/net/sqlite_persistent_cookie_store_unittest.cc',
         'browser/notification_service_impl_unittest.cc',
         'browser/plugin_loader_posix_unittest.cc',
@@ skipping 111 matching lines @@
         '../webkit/appcache/mock_appcache_storage.cc',
         '../webkit/appcache/mock_appcache_storage.h',
         '../webkit/appcache/mock_appcache_storage_unittest.cc',
         '../webkit/blob/blob_storage_controller_unittest.cc',
         '../webkit/blob/blob_url_request_job_unittest.cc',
         '../webkit/blob/local_file_stream_reader_unittest.cc',
         '../webkit/blob/mock_blob_url_request_context.cc',
         '../webkit/blob/mock_blob_url_request_context.h',
         '../webkit/blob/shareable_file_reference_unittest.cc',
         '../webkit/chromeos/fileapi/cros_mount_point_provider_unittest.cc',
+        '../webkit/chromeos/fileapi/file_access_permissions_unittest.cc',
         '../webkit/database/database_connections_unittest.cc',
         '../webkit/database/database_quota_client_unittest.cc',
         '../webkit/database/databases_table_unittest.cc',
         '../webkit/database/database_tracker_unittest.cc',
         '../webkit/database/database_util_unittest.cc',
         '../webkit/dom_storage/dom_storage_area_unittest.cc',
         '../webkit/dom_storage/dom_storage_cached_area_unittest.cc',
         '../webkit/dom_storage/dom_storage_context_unittest.cc',
         '../webkit/dom_storage/dom_storage_database_unittest.cc',
         '../webkit/dom_storage/dom_storage_map_unittest.cc',
@@ skipping 62 matching lines @@
         '../webkit/media/cache_util_unittest.cc',
         '../webkit/media/crypto/key_systems_unittest.cc',
         '../webkit/media/test_response_generator.cc',
         '../webkit/media/test_response_generator.h',
         '../webkit/mocks/mock_weburlloader.cc',
         '../webkit/mocks/mock_weburlloader.h',
         '../webkit/plugins/npapi/plugin_lib_unittest.cc',
         '../webkit/plugins/npapi/plugin_list_unittest.cc',
         '../webkit/plugins/npapi/plugin_utils_unittest.cc',
         '../webkit/plugins/npapi/webplugin_impl_unittest.cc',
+        '../webkit/plugins/ppapi/host_var_tracker_unittest.cc',
+        '../webkit/plugins/ppapi/mock_platform_image_2d.cc',
+        '../webkit/plugins/ppapi/mock_platform_image_2d.h',
+        '../webkit/plugins/ppapi/mock_plugin_delegate.cc',
+        '../webkit/plugins/ppapi/mock_plugin_delegate.h',
+        '../webkit/plugins/ppapi/mock_resource.h',
+        '../webkit/plugins/ppapi/ppapi_plugin_instance_unittest.cc',
+        '../webkit/plugins/ppapi/ppapi_unittest.cc',
+        '../webkit/plugins/ppapi/ppapi_unittest.h',
+        '../webkit/plugins/ppapi/quota_file_io_unittest.cc',
         '../webkit/quota/mock_quota_manager.cc',
         '../webkit/quota/mock_quota_manager.h',
         '../webkit/quota/mock_quota_manager_unittest.cc',
         '../webkit/quota/mock_storage_client.cc',
         '../webkit/quota/mock_storage_client.h',
         '../webkit/quota/quota_database_unittest.cc',
         '../webkit/quota/quota_manager_unittest.cc',
         '../webkit/quota/quota_temporary_storage_evictor_unittest.cc',
+        '../webkit/user_agent/user_agent_unittest.cc',
       ],
       'conditions': [
         ['OS == "ios"', {
           'sources/': [
             # iOS only needs a small portion of content; exclude all the
             # implementation, and re-include what is used.
             ['exclude', '\\.(cc|mm)$'],
             ['include', '_ios\\.(cc|mm)$'],
             ['include', '^browser/notification_service_impl_unittest\\.cc$'],
             ['include', '^browser/speech/.*_unittest\\.cc$'],
@@ skipping 101 matching lines @@
           ],
         }],
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:aura',
           ],
           'sources!': [
             'browser/accessibility/browser_accessibility_win_unittest.cc',
           ],
         }],
+        ['use_aura==1 and OS=="linux"', {
+          # http://crbug.com/234172: these tests depend on single process mode,
+          # which doesn't work in content_browsertests on Linux Aura.
+          'sources!': [
+            'renderer/dom_operations_browsertest.cc',
+            'renderer/dom_serializer_browsertest.cc',
+            'renderer/resource_fetcher_browsertest.cc',
+          ],
+        }],
         ['OS == "android"', {
           'dependencies': [
             '../ui/ui.gyp:shell_dialogs',
           ],
           'sources!': [
             'browser/geolocation/device_data_provider_unittest.cc',
             'browser/geolocation/gps_location_provider_unittest_linux.cc',
             'browser/geolocation/network_location_provider_unittest.cc',
             'browser/geolocation/wifi_data_provider_chromeos_unittest.cc',
             'browser/geolocation/wifi_data_provider_common_unittest.cc',
@@ skipping 112 matching lines @@
             'browser/web_contents/web_contents_view_aura_browsertest.cc',
             'browser/webkit_browsertest.cc',
             'browser/worker_host/test/worker_browsertest.cc',
             'renderer/accessibility/renderer_accessibility_browsertest.cc',
             'renderer/browser_plugin/mock_browser_plugin.h',
             'renderer/browser_plugin/mock_browser_plugin.cc',
             'renderer/browser_plugin/mock_browser_plugin_manager.h',
             'renderer/browser_plugin/mock_browser_plugin_manager.cc',
             'renderer/browser_plugin/browser_plugin_browsertest.h',
             'renderer/browser_plugin/browser_plugin_browsertest.cc',
+            'renderer/cpp_bound_class_unittest.cc',
+            'renderer/dom_operations_browsertest.cc',
+            'renderer/dom_serializer_browsertest.cc',
             'renderer/mouse_lock_dispatcher_browsertest.cc',
             'renderer/password_form_conversion_utils_browsertest.cc',
             'renderer/pepper/mock_renderer_ppapi_host.cc',
             'renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc',
             'renderer/pepper/pepper_file_chooser_host_unittest.cc',
             'renderer/pepper/pepper_graphics_2d_host_unittest.cc',
             'renderer/pepper/pepper_url_request_unittest.cc',
             'renderer/render_thread_impl_browsertest.cc',
             'renderer/render_view_browsertest.cc',
             'renderer/render_view_browsertest_mac.mm',
             'renderer/render_widget_browsertest.cc',
+            'renderer/resource_fetcher_browsertest.cc',
             'test/browser_test_message_pump_android.cc',
             'test/browser_test_message_pump_android.h',
             'test/content_browser_test.h',
             'test/content_browser_test.cc',
             'test/content_browser_test_utils.cc',
             'test/content_browser_test_utils.h',
             'test/content_browser_test_utils_mac.mm',
             'test/content_browser_test_test.cc',
             'test/content_test_launcher.cc',
             'test/layout_browsertest.cc',
             'test/layout_browsertest.h',
             'test/layout_test_http_server.cc',
             'test/layout_test_http_server.h',
+            '../webkit/glue/cpp_binding_example.cc',
+            '../webkit/glue/cpp_binding_example.h',
             '../webkit/plugins/ppapi/mock_platform_image_2d.cc',
             '../webkit/plugins/ppapi/mock_platform_image_2d.h',
             '../webkit/plugins/ppapi/mock_plugin_delegate.cc',
             '../webkit/plugins/ppapi/mock_plugin_delegate.h',
           ],
           'conditions': [
             ['OS=="win"', {
               'resource_include_dirs': [
                 '<(SHARED_INTERMEDIATE_DIR)/webkit',
               ],
@@ skipping 261 matching lines @@
             'resource_dir': 'shell/android/shell_apk/res',
             'additional_src_dirs': ['public/android/javatests/',],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
   ],
 }