mash: Merge ChromeLauncherController and *Impl subclass.

chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h

Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h
index 552c0b0852db3550850daf4f69614b982b2a5929..4589e7e48c1d153b4fc4f4db0de086ed5dcd6626 100644
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h
@@ -16,7 +16,7 @@ class ShelfModel;
 
 class AshInit;
 class CastConfigClientMediaRouter;
-class ChromeLauncherControllerImpl;
+class ChromeLauncherController;
 class ChromeNewWindowClient;
 class ChromeShellContentState;
 class ImmersiveContextMus;
@@ -57,7 +57,7 @@ class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
   // These are only used in Mash; corresponding instances are owned by Ash's
   // ShelfController and ChromeShellDelegate in classic Ash.
   std::unique_ptr<ash::ShelfModel> chrome_shelf_model_;
-  std::unique_ptr<ChromeLauncherControllerImpl> chrome_launcher_controller_;
+  std::unique_ptr<ChromeLauncherController> chrome_launcher_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh);
 };