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..c5aed639fd97c26fa6f1f5b6f8bacd555d2d8145 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,12 +42,13 @@ class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
   void PostMainMessageLoopRun() override;
 
  private:
-  std::unique_ptr<ChromeLauncherControllerMus> chrome_launcher_controller_mus_;
+  std::unique_ptr<ChromeLauncherControllerImpl> chrome_launcher_controller_;
   std::unique_ptr<ChromeShellContentState> chrome_shell_content_state_;
   std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_;
   std::unique_ptr<MediaClient> media_client_;
   std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
   std::unique_ptr<ImmersiveContextMus> immersive_context_;
+  std::unique_ptr<ash::ShelfModel> chrome_shelf_model_;

[James Cook, 2017/04/26 01:03:26]

nit: This and the CLCImpl above need a comment that they are only used in mus. I
would probably put the two members next to each other in the list.

[msw, 2017/04/26 01:35:15]

Done.

   std::unique_ptr<SessionControllerClient> session_controller_client_;
   std::unique_ptr<SystemTrayClient> system_tray_client_;
   std::unique_ptr<ChromeNewWindowClient> new_window_client_;