Move calling of shared browser test methods like SetUpOnMainThread/TearDownOnMainThread/RunTestOn...

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"
 #include "base/debug/stack_trace.h"
 #include "base/feature_list.h"
 #include "base/i18n/icu_util.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_info.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/tracing/tracing_controller_impl.h"
 #include "content/public/app/content_main.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_launcher.h"
 #include "content/public/test/test_utils.h"
 #include "content/test/content_browser_sanity_checker.h"
@@ skipping 107 matching lines @@
 }
 
 }  // namespace
 
 extern int BrowserMain(const MainFunctionParams&);
 
 BrowserTestBase::BrowserTestBase()
     : expected_exit_code_(0),
       enable_pixel_output_(false),
       use_software_compositing_(false),
-      set_up_called_(false) {
+      set_up_called_(false),
+      disable_io_checks_(false) {
 #if defined(OS_MACOSX)
   base::mac::SetOverrideAmIBundled(true);
 #endif
 
   ui::test::EnableTestConfigForPlatformWindows();
 
 #if defined(OS_POSIX)
   handle_sigterm_ = true;
 #endif
 
@@ skipping 177 matching lines @@
         trace_config,
         TracingController::StartTracingDoneCallback());
   }
 
   {
     // 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();
+    PreRunTestOnMainThread();
+    SetUpOnMainThread();
+    bool old_io_allowed_value = false;
+    if (!disable_io_checks_)
+      base::ThreadRestrictions::SetIOAllowed(false);
+    RunTestOnMainThread();
+    if (!disable_io_checks_)
+      base::ThreadRestrictions::SetIOAllowed(old_io_allowed_value);
+    TearDownOnMainThread();
+    PostRunTestOnMainThread();
   }
 
   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())
@@ skipping 42 matching lines @@
   use_software_compositing_ = true;
 }
 
 bool BrowserTestBase::UsingSoftwareGL() const {
   base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   return cmd->GetSwitchValueASCII(switches::kUseGL) ==
          gl::GetGLImplementationName(gl::GetSoftwareGLImplementation());
 }
 
 }  // namespace content