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

content/test/browser_test_base.cc

Index: content/test/browser_test_base.cc
===================================================================
--- content/test/browser_test_base.cc	(revision 148205)
+++ content/test/browser_test_base.cc	(working copy)
@@ -33,6 +33,8 @@
   // The tests assume that file:// URIs can freely access other file:// URIs.
   command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
 
+  command_line->AppendSwitch(switches::kDomAutomationController);
+
   content::MainFunctionParams params(*command_line);
   params.ui_task =
       new base::Closure(
@@ -49,3 +51,11 @@
 void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
   RunTestOnMainThreadLoop();
 }
+
+void BrowserTestBase::CreateTestServer(const char* test_server_base) {
+  CHECK(!test_server_.get());
+  test_server_.reset(new net::TestServer(
+      net::TestServer::TYPE_HTTP,
+      net::TestServer::kLocalhost,
+      FilePath().AppendASCII(test_server_base)));
+}