Convert more test helpers to base::RunLoop, fix page title checks.

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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 323 matching lines @@
           switches::kEnableTracing)) {
     base::trace_event::TraceConfig trace_config(
         base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
             switches::kEnableTracing),
         base::trace_event::RECORD_CONTINUOUSLY);
     TracingController::GetInstance()->StartTracing(
         trace_config,
         TracingController::StartTracingDoneCallback());
   }
 
-  RunTestOnMainThreadLoop();
+  {
+    // This can be called from a posted task. Allow nested tasks here, because
+    // otherwise the test body will have to do it in order to use RunLoop for
+    // waiting.
+    base::MessageLoop::ScopedNestableTaskAllower allow(
+        base::MessageLoop::current());
+    RunTestOnMainThreadLoop();
+  }
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableTracing)) {
     base::FilePath trace_file =
         base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
             switches::kEnableTracingOutput);
     // If there was no file specified, put a hardcoded one in the current
     // working directory.
     if (trace_file.empty())
       trace_file = base::FilePath().AppendASCII("trace.json");
@@ skipping 41 matching lines @@
   use_software_compositing_ = true;
 }
 
 bool BrowserTestBase::UsingOSMesa() const {
   base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   return cmd->GetSwitchValueASCII(switches::kUseGL) ==
          gl::kGLImplementationOSMesaName;
 }
 
 }  // namespace content