Eliminate mojo::Shell client lib class

ash/mus/shelf_delegate_mus.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/shelf_delegate_mus.h"
 
 #include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "base/strings/string_util.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/shell/public/cpp/shell.h"
+#include "mojo/shell/public/cpp/connector.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/mus/window_manager_connection.h"
 
 using mash::wm::mojom::UserWindowController;
 
 namespace ash {
 namespace sysui {
 
 namespace {
@@ skipping 52 matching lines @@
   base::string16 title_;
   UserWindowController* user_window_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateMus);
 };
 
 }  // namespace
 
 ShelfDelegateMus::ShelfDelegateMus(ShelfModel* model)
     : model_(model), binding_(this) {
-  mojo::Shell* shell = views::WindowManagerConnection::Get()->shell();
-  shell->ConnectToInterface("mojo:desktop_wm", &user_window_controller_);
+  mojo::Connector* connector =
+      views::WindowManagerConnection::Get()->connector();
+  connector->ConnectToInterface("mojo:desktop_wm", &user_window_controller_);
   user_window_controller_->AddUserWindowObserver(
       binding_.CreateInterfacePtrAndBind());
 }
 
 ShelfDelegateMus::~ShelfDelegateMus() {}
 
 void ShelfDelegateMus::OnShelfCreated(Shelf* shelf) {
   NOTIMPLEMENTED();
 }
 
@@ skipping 93 matching lines @@
   DCHECK_GE(index, 0);
   ShelfItems::const_iterator iter = model_->ItemByID(shelf_id);
   DCHECK(iter != model_->items().end());
   ShelfItem item = *iter;
   item.status = has_focus ? STATUS_ACTIVE : STATUS_RUNNING;
   model_->Set(index, item);
 }
 
 }  // namespace sysui
 }  // namespace ash