Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc

Index: trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
===================================================================
--- trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc	(revision 272983)
+++ trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc	(working copy)
@@ -6,8 +6,8 @@
 
 #include "base/bind.h"
 #include "base/run_loop.h"
-#include "mojo/public/cpp/application/connect.h"
-#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
+#include "mojo/public/cpp/shell/connect.h"
+#include "mojo/public/interfaces/shell/shell.mojom.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_private.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_private.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h"
@@ -411,10 +411,8 @@
       next_server_change_id_(0),
       sync_factory_(this),
       init_loop_(NULL) {
-  ConnectToService(
-      ViewManagerPrivate(view_manager_).service_provider(),
-      "mojo:mojo_view_manager",
-      &service_);
+  ConnectTo(ViewManagerPrivate(view_manager_).shell(), "mojo:mojo_view_manager",
+            &service_);
   service_.set_client(this);
 
   // Start a runloop. This loop is quit when the server tells us about the