Fix content_browsertests on Android.

content/public/test/browser_test_base.cc

Index: content/public/test/browser_test_base.cc
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc
index 5fed0cc442c9fb8956d943c237bc1d5ed34c0c8c..048442bfd8c515b496e30e5df9e1f128fde977c9 100644
--- a/content/public/test/browser_test_base.cc
+++ b/content/public/test/browser_test_base.cc
@@ -216,18 +216,7 @@ void BrowserTestBase::SetUp() {
       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();
 }