Eliminate mojo::Shell client lib class

components/mus/ws/window_manager_client_apptest.cc

Index: components/mus/ws/window_manager_client_apptest.cc
diff --git a/components/mus/ws/window_manager_client_apptest.cc b/components/mus/ws/window_manager_client_apptest.cc
index 5d9f111183b0d0d6f92082474e13d6835009941f..8bc79727bed8448c6b8a06f7506aaef8de6952df 100644
--- a/components/mus/ws/window_manager_client_apptest.cc
+++ b/components/mus/ws/window_manager_client_apptest.cc
@@ -275,7 +275,7 @@ class WindowServerTest : public WindowServerTestBase {
   // WindowTreeClient.
   mus::mojom::WindowTreeClientPtr ConnectAndGetWindowServerClient() {
     mus::mojom::WindowTreeClientPtr client;
-    shell()->ConnectToInterface(shell_url(), &client);
+    connector()->ConnectToInterface(test_url(), &client);
     return client;
   }
 
@@ -1159,7 +1159,7 @@ TEST_F(WindowServerTest, EstablishConnectionViaFactory) {
   EstablishConnectionViaFactoryDelegate delegate(window_manager());
   set_window_manager_delegate(&delegate);
   scoped_ptr<WindowTreeConnection> second_connection(
-      WindowTreeConnection::Create(this, shell()));
+      WindowTreeConnection::Create(this, connector()));
   Window* window_in_second_connection =
       second_connection->NewTopLevelWindow(nullptr);
   ASSERT_TRUE(window_in_second_connection);