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

webkit/tools/test_shell/test_shell.gypi

Index: webkit/tools/test_shell/test_shell.gypi
===================================================================
--- webkit/tools/test_shell/test_shell.gypi	(revision 195684)
+++ webkit/tools/test_shell/test_shell.gypi	(working copy)
@@ -357,100 +357,9 @@
         {
           'target_name': 'test_shell_tests',
           'type': 'executable',
-          'variables': {
-            'chromium_code': 1,
-          },
-          'dependencies': [
-            '../build/temp_gyp/googleurl.gyp:googleurl',
-            'test_shell_common',
-            '<(DEPTH)/base/base.gyp:test_support_base',
-            '<(DEPTH)/net/net.gyp:net',
-            '<(DEPTH)/net/net.gyp:net_test_support',
-            '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
-            '<(DEPTH)/skia/skia.gyp:skia',
-            '<(DEPTH)/testing/gmock.gyp:gmock',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-            '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-            '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
-          ],
           'sources': [
-            '../../glue/cpp_bound_class_unittest.cc',
-            '../../glue/dom_operations_unittest.cc',
-            '../../glue/dom_serializer_unittest.cc',
-            '../../glue/resource_fetcher_unittest.cc',
-            '../../glue/unittest_test_server.h',
-            '../../mocks/mock_resource_loader_bridge.h',
-            '../../mocks/mock_webframeclient.h',
-            '../../mocks/mock_weburlloader.cc',
-            '../../mocks/mock_weburlloader.h',
-            '../../plugins/ppapi/host_var_tracker_unittest.cc',
-            '../../plugins/ppapi/mock_platform_image_2d.cc',
-            '../../plugins/ppapi/mock_platform_image_2d.h',
-            '../../plugins/ppapi/mock_plugin_delegate.cc',
-            '../../plugins/ppapi/mock_plugin_delegate.h',
-            '../../plugins/ppapi/mock_resource.h',
-            '../../plugins/ppapi/ppapi_plugin_instance_unittest.cc',
-            '../../plugins/ppapi/ppapi_unittest.cc',
-            '../../plugins/ppapi/ppapi_unittest.h',
-            '../../plugins/ppapi/quota_file_io_unittest.cc',
-            '../../user_agent/user_agent_unittest.cc',
-            'mock_spellcheck_unittest.cc',
-            'plugin_tests.cc',
             'run_all_tests.cc',
-            'test_shell_test.cc',
-            'test_shell_test.h',
           ],
-          'conditions': [
-            ['OS=="win"', {
-              'resource_include_dirs': [
-                '<(SHARED_INTERMEDIATE_DIR)/webkit',
-              ],
-              'sources': [ '<@(test_shell_windows_resource_files)' ],
-              'configurations': {
-                'Debug_Base': {
-                  'msvs_settings': {
-                    'VCLinkerTool': {
-                      'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
-                    },
-                  },
-                },
-              },
-            }],
-            ['toolkit_uses_gtk == 1', {
-              'dependencies': [
-                'test_shell_pak',
-                '<(DEPTH)/build/linux/system.gyp:gtk',
-              ],
-            }],
-            ['chromeos==1', {
-              'sources': [
-                '../../chromeos/fileapi/file_access_permissions_unittest.cc',
-                '../../chromeos/fileapi/memory_file_util.cc',
-                '../../chromeos/fileapi/memory_file_util.h',
-                '../../chromeos/fileapi/memory_file_util_unittest.cc',
-              ],
-            }],
-            ['OS=="mac"', {
-              # mac tests load the resources from the built test_shell beside the
-              # test
-              'dependencies': [
-                'test_shell',
-               ],
-            }],
-            ['OS=="win"', {
-              # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-              'msvs_disabled_warnings': [ 4800, 4267 ],
-            }],
-            ['os_posix == 1 and OS != "mac"', {
-              'conditions': [
-                ['linux_use_tcmalloc==1', {
-                  'dependencies': [
-                    '<(DEPTH)/base/allocator/allocator.gyp:allocator',
-                  ],
-                }],
-              ],
-            }],
-          ],
         },
       ],
     }],