mash: Merge ChromeLauncherController and *Impl subclass.

chrome/browser/ui/ash/chrome_shell_delegate.cc

Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index b92e0969832413504207ae2117c2d6a7ba358412..fe5e58b6ec69784d7f42f5211679234db82d2870 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -44,7 +44,7 @@
 #include "chrome/browser/speech/tts_controller.h"
 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h"
 #include "chrome/browser/ui/ash/chrome_keyboard_ui.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/launcher_context_menu.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/palette_delegate_chromeos.h"
@@ -499,7 +499,7 @@ void ChromeShellDelegate::OpenUrlFromArc(const GURL& url) {
 
 void ChromeShellDelegate::ShelfInit() {
   if (!launcher_controller_) {
-    launcher_controller_ = base::MakeUnique<ChromeLauncherControllerImpl>(
+    launcher_controller_ = base::MakeUnique<ChromeLauncherController>(
         nullptr, ash::Shell::Get()->shelf_model());
     launcher_controller_->Init();
   }