Update view manager to support content handling.

mojo/application_manager/application_manager.cc

Index: mojo/application_manager/application_manager.cc
diff --git a/mojo/application_manager/application_manager.cc b/mojo/application_manager/application_manager.cc
index c9b12dedc47f0d61044dcedf9e67e07d098a91b5..207b95001bf87830d86a865eca1bb2030d1e0df5 100644
--- a/mojo/application_manager/application_manager.cc
+++ b/mojo/application_manager/application_manager.cc
@@ -65,13 +65,16 @@ class ApplicationManager::LoadCallbacksImpl
     return shell_handle.Pass();
   }
 
-  virtual void LoadWithContentHandler(const GURL& content_handler_url,
-                                      URLResponsePtr content) OVERRIDE {
+  virtual void LoadWithContentHandler(
+      const GURL& content_handler_url,
+      URLResponsePtr url_response,
+      URLLoaderPtr url_loader) OVERRIDE {
     if (manager_) {
       manager_->LoadWithContentHandler(requested_url_,
                                        requestor_url_,
                                        content_handler_url,
-                                       content.Pass(),
+                                       url_response.Pass(),
+                                       url_loader.Pass(),
                                        service_provider_.Pass());
     }
   }
@@ -232,7 +235,8 @@ void ApplicationManager::LoadWithContentHandler(
     const GURL& content_url,
     const GURL& requestor_url,
     const GURL& content_handler_url,
-    URLResponsePtr content,
+    URLResponsePtr url_response,
+    URLLoaderPtr url_loader,
     ServiceProviderPtr service_provider) {
   ContentHandlerConnection* connection = NULL;
   URLToContentHandlerMap::iterator iter =
@@ -243,8 +247,17 @@ void ApplicationManager::LoadWithContentHandler(
     connection = new ContentHandlerConnection(this, content_handler_url);
     url_to_content_handler_[content_handler_url] = connection;
   }
+
+  InterfaceRequest<ServiceProvider> spir;
+  spir.Bind(service_provider.PassMessagePipe());
+
+  ContentHandlerResponsePtr content_handler_response(
+      ContentHandlerResponse::New());
+  content_handler_response->response = url_response.Pass();
+  content_handler_response->loader = url_loader.Pass();
+
   connection->content_handler->OnConnect(
-      content_url.spec(), content.Pass(), service_provider.Pass());
+      content_url.spec(), content_handler_response.Pass(), spir.Pass());
 }
 
 void ApplicationManager::SetLoaderForURL(scoped_ptr<ApplicationLoader> loader,