Eliminate mojo::Shell client lib class

ash/mus/sysui_application.cc

 // Copyright 2016 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 "ash/mus/sysui_application.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/ash_window_tree_host_platform.h"
 #include "ash/mus/keyboard_ui_mus.h"
@@ skipping 156 matching lines @@
  public:
   AshInit() : worker_pool_(new base::SequencedWorkerPool(2, "AshWorkerPool")) {
     ui::RegisterPathProvider();
     InitializeResourceBundle();
   }
 
   ~AshInit() { worker_pool_->Shutdown(); }
 
   aura::Window* root() { return ash::Shell::GetPrimaryRootWindow(); }
 
-  void Initialize(mojo::Shell* shell) {
-    aura_init_.reset(new views::AuraInit(shell, "views_mus_resources.pak"));
-    views::WindowManagerConnection::Create(shell);
+  void Initialize(mojo::Connector* connector) {
+    aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
+    views::WindowManagerConnection::Create(connector);
 
     gfx::Screen* screen = gfx::Screen::GetScreen();
     DCHECK(screen);
     gfx::Size size = screen->GetPrimaryDisplay().bounds().size();
 
     // Uninstall the ScreenMus installed by WindowManagerConnection, so that ash
     // installs and uses the ScreenAsh. This can be removed once ash learns to
     // talk to mus for managing displays.
     gfx::Screen::SetScreenInstance(nullptr);
 
     // Install some hook so that the WindowTreeHostMus created for widgets can
     // be hooked up correctly.
     native_widget_factory_.reset(new NativeWidgetFactory());
 
     ash::AshWindowTreeHost::SetFactory(base::Bind(&CreateWindowTreeHostMus));
     ash_delegate_ = new ShellDelegateMus;
 
     InitializeComponents();
 
     ash::ShellInitParams init_params;
     init_params.delegate = ash_delegate_;
     init_params.context_factory = new StubContextFactory;
     init_params.blocking_pool = worker_pool_.get();
     init_params.in_mus = true;
-    init_params.keyboard_factory = base::Bind(&KeyboardUIMus::Create, shell);
+    init_params.keyboard_factory =
+        base::Bind(&KeyboardUIMus::Create, connector);
     ash::Shell::CreateInstance(init_params);
     ash::Shell::GetInstance()->CreateShelf();
     ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
         ash::user::LOGGED_IN_USER);
 
     ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
     SetupWallpaper(SkColorSetARGB(255, 0, 255, 0));
   }
 
   void InitializeResourceBundle() {
@@ skipping 54 matching lines @@
   ShellDelegateMus* ash_delegate_ = nullptr;
   scoped_ptr<NativeWidgetFactory> native_widget_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AshInit);
 };
 
 SysUIApplication::SysUIApplication() {}
 
 SysUIApplication::~SysUIApplication() {}
 
-void SysUIApplication::Initialize(mojo::Shell* shell,
+void SysUIApplication::Initialize(mojo::Connector* connector,
                                   const std::string& url,
                                   uint32_t id,
                                   uint32_t user_id) {
   ash_init_.reset(new AshInit());
-  ash_init_->Initialize(shell);
+  ash_init_->Initialize(connector);
 }
 
 bool SysUIApplication::AcceptConnection(mojo::Connection* connection) {
   return true;
 }
 
 }  // namespace sysui
 }  // namespace ash