mash: Merge ChromeLauncherController and *Impl subclass.

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

 // Copyright (c) 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/launcher_context_menu.h"
 
 #include <memory>
 
 #include "ash/public/cpp/shelf_item.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm_window.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_shelf_id.h"
 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h"
 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/desktop_shell_launcher_context_menu.h"
 #include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/arc/test/fake_app_instance.h"
 #include "components/exo/shell_surface.h"
 #include "components/prefs/pref_service.h"
 #include "components/session_manager/core/session_manager.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // A shell delegate that owns a ChromeLauncherController, like production.
 class ChromeLauncherTestShellDelegate : public ash::test::TestShellDelegate {
  public:
   explicit ChromeLauncherTestShellDelegate(Profile* profile)
       : profile_(profile) {}
 
-  ChromeLauncherControllerImpl* controller() { return controller_.get(); }
+  ChromeLauncherController* controller() { return controller_.get(); }
 
   // ash::test::TestShellDelegate:
   void ShelfInit() override {
     if (!controller_) {
-      controller_ = base::MakeUnique<ChromeLauncherControllerImpl>(
+      controller_ = base::MakeUnique<ChromeLauncherController>(
           profile_, ash::Shell::Get()->shelf_model());
       controller_->Init();
     }
   }
   void ShelfShutdown() override { controller_.reset(); }
 
  private:
   Profile* profile_;
-  std::unique_ptr<ChromeLauncherControllerImpl> controller_;
+  std::unique_ptr<ChromeLauncherController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherTestShellDelegate);
 };
 
 class LauncherContextMenuTest : public ash::test::AshTestBase {
  protected:
   static bool IsItemPresentInMenu(LauncherContextMenu* menu, int command_id) {
     return menu->GetIndexOfCommandId(command_id) != -1;
   }
 
@@ skipping 37 matching lines @@
     widget->Activate();
     exo::ShellSurface::SetApplicationId(widget->GetNativeWindow(),
                                         window_app_id);
     return widget;
   }
 
   ArcAppTest& arc_test() { return arc_test_; }
 
   Profile* profile() { return &profile_; }
 
-  ChromeLauncherControllerImpl* controller() {
+  ChromeLauncherController* controller() {
     return shell_delegate_->controller();
   }
 
  private:
   TestingProfile profile_;
   ChromeLauncherTestShellDelegate* shell_delegate_ = nullptr;
   ArcAppTest arc_test_;
   std::unique_ptr<session_manager::SessionManager> session_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherContextMenuTest);
@@ skipping 197 matching lines @@
       ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(primary_id)));
   std::unique_ptr<LauncherContextMenu> secondary_menu(CreateLauncherContextMenu(
       ash::TYPE_BROWSER_SHORTCUT, GetWmShelf(secondary_id)));
   EXPECT_FALSE(IsItemPresentInMenu(primary_menu.get(),
                                    LauncherContextMenu::MENU_AUTO_HIDE));
   EXPECT_TRUE(IsItemPresentInMenu(secondary_menu.get(),
                                   LauncherContextMenu::MENU_AUTO_HIDE));
 }
 
 }  // namespace