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

content/test/browser_test_base.cc

 // Copyright (c) 2011 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.
 
 #include "content/test/browser_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
@@ skipping 15 matching lines @@
 
 BrowserTestBase::~BrowserTestBase() {
 }
 
 void BrowserTestBase::SetUp() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   // 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(
           base::Bind(&BrowserTestBase::ProxyRunTestOnMainThreadLoop, this));
 
   SetUpInProcessBrowserTestFixture();
   BrowserMain(params);
   TearDownInProcessBrowserTestFixture();
 }
 
 void BrowserTestBase::TearDown() {
 }
 
 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)));
+}