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

content/test/content_browser_test.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/content_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/url_constants.h"
 #include "content/shell/shell.h"
+#include "content/shell/shell_browser_context.h"
+#include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_main_delegate.h"
 #include "content/shell/shell_switches.h"
 #include "content/test/test_content_client.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 
 namespace content {
 
 ContentBrowserTest::ContentBrowserTest() {
 #if defined(OS_MACOSX)
   // See comment in InProcessBrowserTest::InProcessBrowserTest().
   FilePath content_shell_path;
   CHECK(PathService::Get(base::FILE_EXE, &content_shell_path));
   content_shell_path = content_shell_path.DirName();
   content_shell_path = content_shell_path.Append(
       FILE_PATH_LITERAL("Content Shell.app/Contents/MacOS/Content Shell"));
   CHECK(PathService::Override(base::FILE_EXE, content_shell_path));
 #endif
+  CreateTestServer("content/test/data");
 }
 
 ContentBrowserTest::~ContentBrowserTest() {
 }
 
 void ContentBrowserTest::SetUp() {
   shell_main_delegate_.reset(new ShellMainDelegate);
   shell_main_delegate_->PreSandboxStartup();
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
@@ skipping 64 matching lines @@
 #if defined(OS_MACOSX)
   pool.Recycle();
 #endif
 
   for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     i.GetCurrentValue()->FastShutdownIfPossible();
   }
 }
 
+Shell* ContentBrowserTest::CreateBrowser() {
+  ShellContentBrowserClient* browser_client =
+      static_cast<ShellContentBrowserClient*>(GetContentClient()->browser());
+  return Shell::CreateNewWindow(
+      browser_client->browser_context(),
+      GURL(chrome::kAboutBlankURL),
+      NULL,
+      MSG_ROUTING_NONE,
+      NULL);
+}
+
+Shell* ContentBrowserTest::CreateOffTheRecordBrowser() {
+  ShellContentBrowserClient* browser_client =
+      static_cast<ShellContentBrowserClient*>(GetContentClient()->browser());
+  return Shell::CreateNewWindow(
+      browser_client->off_the_record_browser_context(),
+      GURL(chrome::kAboutBlankURL),
+      NULL,
+      MSG_ROUTING_NONE,
+      NULL);
+}
+
 }  // namespace content