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

extensions/shell/test/shell_test.cc

 // Copyright 2014 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 "extensions/shell/test/shell_test.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 29 matching lines @@
 AppShellTest::~AppShellTest() {
 }
 
 void AppShellTest::SetUp() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   command_line->AppendSwitchASCII(switches::kTestType, "appshell");
   SetUpCommandLine(command_line);
   content::BrowserTestBase::SetUp();
 }
 
-void AppShellTest::SetUpOnMainThread() {
+void AppShellTest::PreRunTestOnMainThread() {
   browser_context_ = ShellContentBrowserClient::Get()->GetBrowserContext();
 
   extension_system_ = static_cast<ShellExtensionSystem*>(
       ExtensionSystem::Get(browser_context_));
   extension_system_->Init();
+  DCHECK(base::MessageLoopForUI::IsCurrent());
+  base::RunLoop().RunUntilIdle();
 }
 
-void AppShellTest::RunTestOnMainThreadLoop() {
-  DCHECK(base::MessageLoopForUI::IsCurrent());
-  base::RunLoop().RunUntilIdle();
-
-  SetUpOnMainThread();
-
-  RunTestOnMainThread();
-
-  TearDownOnMainThread();
-
+void AppShellTest::PostRunTestOnMainThread() {
   // Clean up the app window.
   DesktopController::instance()->CloseAppWindows();
 }
 
 }  // namespace extensions