Update view_manager and window_manager to make use of content handling.

mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc

Index: mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
index 88b3548b021637c4b421c3e50180f54c2b07e6ab..b90da0435718ce24a7b05e16ea40b54f787b9873 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
@@ -8,10 +8,10 @@
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
-#include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
+#include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_private.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
@@ -119,7 +119,7 @@ bool CreateMapAndDupSharedBuffer(size_t size,
 
 ViewManagerClientImpl::ViewManagerClientImpl(
     ViewManagerDelegate* delegate,
-    ApplicationConnection* app_connection)
+    Shell* shell)
     : connected_(false),
       connection_id_(0),
       next_id_(1),
@@ -133,7 +133,9 @@ ViewManagerClientImpl::ViewManagerClientImpl(
         base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
             "window-manager");
   }
-  app_connection->ConnectToService(window_manager_url, &window_manager_);
+  InterfacePtr<ServiceProvider> sp;
+  shell->ConnectToApplication(window_manager_url, Get(&sp));
+  ConnectToService(sp.get(), &window_manager_);
   window_manager_.set_client(this);
 }