Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/services/view_manager/view_manager_connection_unittest.cc

Index: trunk/src/mojo/services/view_manager/view_manager_connection_unittest.cc
===================================================================
--- trunk/src/mojo/services/view_manager/view_manager_connection_unittest.cc	(revision 272983)
+++ trunk/src/mojo/services/view_manager/view_manager_connection_unittest.cc	(working copy)
@@ -12,9 +12,9 @@
 #include "base/strings/stringprintf.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/geometry/geometry_type_converters.h"
-#include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.h"
+#include "mojo/public/cpp/shell/connect.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_types.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
@@ -376,9 +376,7 @@
   virtual void SetUp() OVERRIDE {
     test_helper_.Init();
 
-    ConnectToService(test_helper_.service_provider(),
-                     "mojo:mojo_view_manager",
-                     &view_manager_);
+    ConnectTo(test_helper_.shell(), "mojo:mojo_view_manager", &view_manager_);
     view_manager_.set_client(&client_);
 
     client_.WaitForId();
@@ -388,9 +386,7 @@
  protected:
   // Creates a second connection to the viewmanager.
   void EstablishSecondConnection() {
-    ConnectToService(test_helper_.service_provider(),
-                     "mojo:mojo_view_manager",
-                     &view_manager2_);
+    ConnectTo(test_helper_.shell(), "mojo:mojo_view_manager", &view_manager2_);
     view_manager2_.set_client(&client2_);
 
     client2_.WaitForId();