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

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 524 matching lines @@
         '../ui/ui.gyp:ui',
         '../webkit/support/webkit_support.gyp:glue',
       ],
       'include_dirs': [
         '..',
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
       ],
       'sources': [
+        'browser/appcache/appcache_browsertest.cc',
+        'browser/audio_browsertest.cc',
+        'browser/in_process_webkit/indexed_db_layout_browsertest.cc',
+        'browser/media_browsertest.cc',
         'browser/plugin_browsertest.cc',
+        'browser/worker_host/test/worker_browsertest.cc',
         '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',
       ],
       'conditions': [
         ['OS=="win"', {
           'resource_include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
           ],
           'sources': [
             'shell/resource.h',
             'shell/shell.rc',
             # TODO:  It would be nice to have these pulled in
@@ skipping 146 matching lines @@
               '<(PRODUCT_DIR)/lib.java/chromium_content.jar',
               '<(PRODUCT_DIR)/lib.java/chromium_net.jar',
             ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }