Convert a bunch of test_shell_tests to content_browsertests. These are tests that depend on loading…

content/public/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/public/test/browser_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/process_util.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
+#include "content/public/test/test_utils.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/power_monitor/power_monitor.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/browser/browser_thread.h"
 #endif
 
+namespace content {
 namespace {
 
 #if defined(OS_POSIX)
 // On SIGTERM (sent by the runner on timeouts), dump a stack trace (to make
 // debugging easier) and also exit with a known error code (so that the test
 // framework considers this a failure -- http://crbug.com/57578).
 // Note: We only want to do this in the browser process, and not forked
 // processes. That might lead to hangs because of locks inside tcmalloc or the
 // OS. See http://crbug.com/141302.
 static int g_browser_process_pid;
 static void DumpStackTraceSignalHandler(int signal) {
   if (g_browser_process_pid == base::GetCurrentProcId()) {
     logging::RawLog(logging::LOG_ERROR,
                     "BrowserTestBase signal handler received SIGTERM. "
                     "Backtrace:\n");
     base::debug::StackTrace().PrintBacktrace();
   }
   _exit(128 + signal);
 }
 #endif  // defined(OS_POSIX)
 
+void RunTaskOnRendererThread(const base::Closure& task,
+                             const base::Closure& quit_task) {
+  task.Run();
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, quit_task);
+}
+
 }  // namespace
 
-namespace content {
-
-extern int BrowserMain(const content::MainFunctionParams&);
+extern int BrowserMain(const MainFunctionParams&);
 
 BrowserTestBase::BrowserTestBase() {
 #if defined(OS_MACOSX)
   base::mac::SetOverrideAmIBundled(true);
   base::PowerMonitor::AllocateSystemIOPorts();
 #endif
 
 #if defined(OS_POSIX)
   handle_sigterm_ = true;
 #endif
@@ skipping 52 matching lines @@
 }
 
 void BrowserTestBase::CreateTestServer(const base::FilePath& test_server_base) {
   CHECK(!test_server_.get());
   test_server_.reset(new net::TestServer(
       net::TestServer::TYPE_HTTP,
       net::TestServer::kLocalhost,
       test_server_base));
 }
 
+void BrowserTestBase::PostTaskToInProcessRendererAndWait(
+    const base::Closure& task) {
+  CHECK(CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess));
+
+  scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner;
+
+  base::MessageLoop* renderer_loop =
+      RenderProcessHostImpl::GetInProcessRendererThreadForTesting();
+  CHECK(renderer_loop);
+
+  renderer_loop->PostTask(
+      FROM_HERE,
+      base::Bind(&RunTaskOnRendererThread, task, runner->QuitClosure()));
+  runner->Run();
+}
+
 }  // namespace content