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

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi	(revision 148205)
+++ chrome/chrome_tests.gypi	(working copy)
@@ -336,8 +336,6 @@
       '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',
@@ -3008,8 +3006,6 @@
         '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',
@@ -3054,17 +3050,13 @@
         '../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',
@@ -3074,15 +3066,12 @@
         '../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': [