Move all the layout tests that ran under browser_tests to run under content_browsertests.

chrome/chrome_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.
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 318 matching lines @@
       ],
       'export_dependent_settings': [
         'test_support_common',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/automation/proxy_launcher.cc',
         'test/automation/proxy_launcher.h',
-        'test/base/layout_test_http_server.cc',
-        'test/base/layout_test_http_server.h',
         'test/reliability/automated_ui_test_base.cc',
         'test/reliability/automated_ui_test_base.h',
         'test/ui/javascript_test_util.cc',
         'test/ui/run_all_unittests.cc',
         'test/ui/ui_perf_test.cc',
         'test/ui/ui_perf_test.h',
         'test/ui/ui_test.cc',
         'test/ui/ui_test.h',
         'test/ui/ui_test_suite.cc',
         'test/ui/ui_test_suite.h',
@@ skipping 2650 matching lines @@
         'renderer/automation/automation_renderer_helper_browsertest.cc',
         'renderer/content_settings_observer_browsertest.cc',
         'renderer/page_click_tracker_browsertest.cc',
         'renderer/print_web_view_helper_browsertest.cc',
         'renderer/safe_browsing/malware_dom_details_browsertest.cc',
         'renderer/safe_browsing/phishing_classifier_browsertest.cc',
         'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc',
         'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc',
         'renderer/safe_browsing/phishing_thumbnailer_browsertest.cc',
         'renderer/translate_helper_browsertest.cc',
-        'test/base/layout_test_http_server.cc',
-        'test/base/layout_test_http_server.h',
         'test/base/empty_browser_test.cc',
         'test/base/in_process_browser_test_browsertest.cc',
         'test/base/chrome_render_view_test.cc',
         'test/base/chrome_render_view_test.h',
         'test/base/chrome_test_launcher.cc',
         'test/data/webui/assertions.js',
         'test/data/webui/async_gen.cc',
         'test/data/webui/async_gen.h',
         'test/data/webui/async_gen.js',
         'test/data/webui/certificate_viewer_dialog_test.js',
@@ skipping 24 matching lines @@
         'test/security_tests/sandbox_browsertest.cc',
         # TODO(craig): Rename this and run from base_unittests when the test
         # is safe to run there. See http://crbug.com/78722 for details.
         '../base/files/file_path_watcher_browsertest.cc',
         '../content/browser/accessibility/cross_platform_accessibility_browsertest.cc',
         '../content/browser/accessibility/dump_accessibility_tree_browsertest.cc',
         '../content/browser/accessibility/dump_accessibility_tree_helper.cc',
         '../content/browser/accessibility/dump_accessibility_tree_helper.h',
         '../content/browser/accessibility/dump_accessibility_tree_helper_mac.mm',
         '../content/browser/accessibility/dump_accessibility_tree_helper_win.cc',
-        '../content/browser/appcache/appcache_browsertest.cc',
-        '../content/browser/audio_browsertest.cc',
         '../content/browser/child_process_security_policy_browsertest.cc',
         '../content/browser/device_orientation/device_orientation_browsertest.cc',
         '../content/browser/dom_storage/dom_storage_browsertest.cc',
         '../content/browser/download/mhtml_generation_browsertest.cc',
         '../content/browser/fileapi/file_system_browsertest.cc',
         '../content/browser/in_process_webkit/indexed_db_browsertest.cc',
-        '../content/browser/in_process_webkit/indexed_db_layout_browsertest.cc',
         '../content/browser/indexed_db/idbbindingutilities_browsertest.cc',
-        '../content/browser/media_browsertest.cc',
         '../content/browser/plugin_data_remover_impl_browsertest.cc',
         '../content/browser/plugin_service_impl_browsertest.cc',
         '../content/browser/renderer_host/render_process_host_browsertest.cc',
         '../content/browser/renderer_host/render_view_host_browsertest.cc',
         '../content/browser/renderer_host/render_view_host_manager_browsertest.cc',
         '../content/browser/renderer_host/resource_dispatcher_host_browsertest.cc',
         '../content/browser/session_history_browsertest.cc',
         '../content/browser/speech/speech_recognition_browsertest.cc',
         '../content/browser/webkit_browsertest.cc',
-        '../content/browser/worker_host/test/worker_browsertest.cc',
         '../content/public/test/render_widget_browsertest.h',
         '../content/renderer/mouse_lock_dispatcher_browsertest.cc',
         '../content/renderer/pepper/pepper_file_chooser_host_unittest.cc',
         '../content/renderer/render_view_browsertest.cc',
         '../content/renderer/render_view_browsertest_mac.mm',
         '../content/renderer/renderer_accessibility_browsertest.cc',
-        '../content/test/layout_browsertest.cc',
-        '../content/test/layout_browsertest.h',
         '../content/test/render_widget_browsertest.cc',
       ],
       'rules': [
         {
           'rule_name': 'js2webui',
           'extension': 'js',
           'msvs_external_rule': 1,
           'inputs': [
             '<(gypv8sh)',
             '<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)',
@@ skipping 1597 matching lines @@
             'input_jars_paths': [
               '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
              ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],  # 'conditions'
 }