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

content/public/test/content_browser_test.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/content_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
-#include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "content/shell/browser/shell_content_browser_client.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client.h"
 #include "content/test/test_content_client.h"
 
 #if defined(OS_ANDROID)
 #include "content/shell/app/shell_main_delegate.h"
 #endif
 
-#if defined(OS_MACOSX)
-#include "base/mac/scoped_nsautorelease_pool.h"
-#endif
-
 #if !defined(OS_CHROMEOS) && defined(OS_LINUX)
 #include "ui/base/ime/input_method_initializer.h"
 #endif
 
 namespace content {
 
 ContentBrowserTest::ContentBrowserTest() {
 #if defined(OS_MACOSX)
   // See comment in InProcessBrowserTest::InProcessBrowserTest().
   base::FilePath content_shell_path;
@@ skipping 56 matching lines @@
   // LinuxInputMethodContextFactory has to be shutdown.
 #if !defined(OS_CHROMEOS) && defined(OS_LINUX)
   ui::ShutdownInputMethodForTesting();
 #endif
 
 #if defined(OS_ANDROID)
   shell_main_delegate_.reset();
 #endif
 }
 
-void ContentBrowserTest::RunTestOnMainThreadLoop() {
+void ContentBrowserTest::PreRunTestOnMainThread() {
   if (!switches::IsRunLayoutTestSwitchPresent()) {
     CHECK_EQ(Shell::windows().size(), 1u);
     shell_ = Shell::windows()[0];
   }
 
 #if defined(OS_MACOSX)
   // On Mac, without the following autorelease pool, code which is directly
   // executed (as opposed to executed inside a message loop) would autorelease
   // objects into a higher-level pool. This pool is not recycled in-sync with
   // the message loops' pools and causes problems with code relying on
   // deallocation via an autorelease pool (such as browser window closure and
   // browser shutdown). To avoid this, the following pool is recycled after each
   // time code is directly executed.
-  base::mac::ScopedNSAutoreleasePool pool;
+  pool_ = new base::mac::ScopedNSAutoreleasePool;
 #endif
 
   // Pump startup related events.
   DCHECK(base::MessageLoopForUI::IsCurrent());
   base::RunLoop().RunUntilIdle();
 
 #if defined(OS_MACOSX)
-  pool.Recycle();
+  pool_->Recycle();
 #endif
+}
 
-  SetUpOnMainThread();
-
-  bool old_io_allowed_value = base::ThreadRestrictions::SetIOAllowed(false);
-  RunTestOnMainThread();
-  base::ThreadRestrictions::SetIOAllowed(old_io_allowed_value);
-
-  TearDownOnMainThread();
+void ContentBrowserTest::PostRunTestOnMainThread() {
 #if defined(OS_MACOSX)
-  pool.Recycle();
+  pool_->Recycle();
 #endif
 
   for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     i.GetCurrentValue()->FastShutdownIfPossible();
   }
 
   Shell::CloseAllWindows();
 }
 
 Shell* ContentBrowserTest::CreateBrowser() {
   return Shell::CreateNewWindow(
       ShellContentBrowserClient::Get()->browser_context(),
       GURL(url::kAboutBlankURL),
       NULL,
       gfx::Size());
 }
 
 Shell* ContentBrowserTest::CreateOffTheRecordBrowser() {
   return Shell::CreateNewWindow(
       ShellContentBrowserClient::Get()->off_the_record_browser_context(),
       GURL(url::kAboutBlankURL),
       NULL,
       gfx::Size());
 }
 
 }  // namespace content