Fix content_browsertests on Android.

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/message_loop/message_loop.h"
@@ skipping 198 matching lines @@
   net::ScopedDefaultHostResolverProc scoped_local_host_resolver_proc(
       rule_based_resolver_.get());
 
   SetUpInProcessBrowserTestFixture();
 
   MainFunctionParams params(*command_line);
   params.ui_task =
       new base::Closure(
           base::Bind(&BrowserTestBase::ProxyRunTestOnMainThreadLoop, this));
 
-#if defined(OS_ANDROID)
-  BrowserMainRunner::Create()->Initialize(params);
-  // We are done running the test by now. During teardown we

[Yaron, 2013/10/18 23:03:16]

It looks like this was added in https://chromiumcodereview.appspot.com/12188016

Have you verified that this doesn't break any other tests? I kicked off
android_fyi_dbg which should run content_browsertests.

I'm not really familiar with this enough to know if it makes sense.

-  // need to be able to perform IO.
-  base::ThreadRestrictions::SetIOAllowed(true);
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(base::IgnoreResult(&base::ThreadRestrictions::SetIOAllowed),
-                 true));
-#else
   BrowserMain(params);
-#endif
   TearDownInProcessBrowserTestFixture();
 }
 
 void BrowserTestBase::TearDown() {
 }
 
 void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
 #if defined(OS_POSIX)
   if (handle_sigterm_) {
     g_browser_process_pid = base::GetCurrentProcId();
@@ skipping 21 matching lines @@
       RenderProcessHostImpl::GetInProcessRendererThreadForTesting();
   CHECK(renderer_loop);
 
   renderer_loop->PostTask(
       FROM_HERE,
       base::Bind(&RunTaskOnRendererThread, task, runner->QuitClosure()));
   runner->Run();
 }
 
 }  // namespace content