Eliminate mojo::Shell client lib class

mash/wm/window_manager_application.cc

Index: mash/wm/window_manager_application.cc
diff --git a/mash/wm/window_manager_application.cc b/mash/wm/window_manager_application.cc
index f02f6139d8edea010e6339aa2046305fe38c5764..5f5089a54d77f5f4c88e4dfa0c27b23e4fa5dd0c 100644
--- a/mash/wm/window_manager_application.cc
+++ b/mash/wm/window_manager_application.cc
@@ -16,7 +16,7 @@
 #include "mash/wm/user_window_controller_impl.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/shell/public/cpp/connection.h"
-#include "mojo/shell/public/cpp/shell.h"
+#include "mojo/shell/public/cpp/connector.h"
 #include "ui/mojo/init/ui_init.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/display_converter.h"
@@ -25,7 +25,7 @@ namespace mash {
 namespace wm {
 
 WindowManagerApplication::WindowManagerApplication()
-    : shell_(nullptr), window_manager_factory_binding_(this) {}
+    : connector_(nullptr), window_manager_factory_binding_(this) {}
 
 WindowManagerApplication::~WindowManagerApplication() {
   // AcceleratorRegistrarImpl removes an observer in its destructor. Destroy
@@ -56,7 +56,7 @@ void WindowManagerApplication::OnRootWindowControllerGotRoot(
 
   ui_init_.reset(new ui::mojo::UIInit(
       views::GetDisplaysFromWindow(root_controller->root())));
-  aura_init_.reset(new views::AuraInit(shell_, "mash_wm_resources.pak"));
+  aura_init_.reset(new views::AuraInit(connector_, "mash_wm_resources.pak"));
 }
 
 void WindowManagerApplication::OnRootWindowControllerDoneInit(
@@ -103,15 +103,15 @@ void WindowManagerApplication::OnAcceleratorRegistrarDestroyed(
   accelerator_registrars_.erase(registrar);
 }
 
-void WindowManagerApplication::Initialize(mojo::Shell* shell,
+void WindowManagerApplication::Initialize(mojo::Connector* connector,
                                           const std::string& url,
                                           uint32_t id,
                                           uint32_t user_id) {
-  shell_ = shell;
-  tracing_.Initialize(shell, url);
+  connector_ = connector;
+  tracing_.Initialize(connector, url);
 
   mus::mojom::WindowManagerFactoryServicePtr wm_factory_service;
-  shell_->ConnectToInterface("mojo:mus", &wm_factory_service);
+  connector_->ConnectToInterface("mojo:mus", &wm_factory_service);
   wm_factory_service->SetWindowManagerFactory(
       window_manager_factory_binding_.CreateInterfacePtrAndBind());