mash: Use ChromeLauncherControllerImpl, remove Mus subclass stub.

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 5052b651e35a06d9c2611d41ad0f8b5663d5ce7a..552c0b0852db3550850daf4f69614b982b2a5929 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
@@ -10,9 +10,13 @@
 #include "base/macros.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 
+namespace ash {
+class ShelfModel;
+}
+
 class AshInit;
 class CastConfigClientMediaRouter;
-class ChromeLauncherControllerMus;
+class ChromeLauncherControllerImpl;
 class ChromeNewWindowClient;
 class ChromeShellContentState;
 class ImmersiveContextMus;
@@ -38,7 +42,6 @@ class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
   void PostMainMessageLoopRun() override;
 
  private:
-  std::unique_ptr<ChromeLauncherControllerMus> chrome_launcher_controller_mus_;
   std::unique_ptr<ChromeShellContentState> chrome_shell_content_state_;
   std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_;
   std::unique_ptr<MediaClient> media_client_;
@@ -51,6 +54,11 @@ class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
   std::unique_ptr<VpnListForwarder> vpn_list_forwarder_;
   std::unique_ptr<AshInit> ash_init_;
 
+  // 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_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh);
 };