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

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
 
 #include <stddef.h>
 
 #include "ash/public/cpp/app_launch_id.h"
 #include "ash/public/cpp/shelf_item_delegate.h"
@@ skipping 206 matching lines @@
 
 }  // namespace
 
 class LauncherPlatformAppBrowserTest
     : public extensions::PlatformAppBrowserTest {
  protected:
   LauncherPlatformAppBrowserTest() : controller_(nullptr) {}
 
   ~LauncherPlatformAppBrowserTest() override {}
 
-  void RunTestOnMainThreadLoop() override {
+  void SetUpOnMainThread() override {
     // Ensure ash starts the session and creates the shelf and controller.
     SessionControllerClient::FlushForTesting();
 
     controller_ = GetChromeLauncherControllerImpl();
     ASSERT_TRUE(controller_);
-    return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();
+    extensions::PlatformAppBrowserTest::SetUpOnMainThread();
   }
 
   ash::ShelfModel* shelf_model() { return ash::Shell::Get()->shelf_model(); }
 
   ash::ShelfID CreateAppShortcutLauncherItem(
       const ash::AppLaunchId& app_launch_id) {
     return controller_->CreateAppShortcutLauncherItem(
         app_launch_id, shelf_model()->item_count());
   }
 
@@ skipping 30 matching lines @@
   RIP_OFF_ITEM_AND_DONT_RELEASE_MOUSE,
 };
 
 class ShelfAppBrowserTest : public ExtensionBrowserTest {
  protected:
   ShelfAppBrowserTest() : shelf_(NULL), model_(NULL), controller_(NULL) {
   }
 
   ~ShelfAppBrowserTest() override {}
 
-  void RunTestOnMainThreadLoop() override {
+  void SetUpOnMainThread() override {
     // Ensure ash starts the session and creates the shelf and controller.
     SessionControllerClient::FlushForTesting();
 
     shelf_ =
         ash::WmShelf::ForWindow(ash::ShellPort::Get()->GetPrimaryRootWindow());
     model_ = ash::Shell::Get()->shelf_model();
     controller_ = GetChromeLauncherControllerImpl();
     ASSERT_TRUE(controller_);
-    return ExtensionBrowserTest::RunTestOnMainThreadLoop();
+    ExtensionBrowserTest::SetUpOnMainThread();
   }
 
   size_t NumberOfDetectedLauncherBrowsers(bool show_all_tabs) {
     ash::ShelfItemDelegate* item_controller =
         controller_->GetBrowserShortcutLauncherItemController();
     return item_controller
         ->GetAppMenuItems(show_all_tabs ? ui::EF_SHIFT_DOWN : 0)
         .size();
   }
 
@@ skipping 2105 matching lines @@
 
   // Close all windows via the menu item.
   CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE);
   EXPECT_EQ(0u, BrowserList::GetInstance()->size());
 
   // Check if "Close" is removed from the context menu.
   std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu();
   ASSERT_FALSE(
       IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE));
 }