Mojo: Fix two bugs in content handling

mojo/examples/content_handler_demo/content_handler_demo.cc

Index: mojo/examples/content_handler_demo/content_handler_demo.cc
diff --git a/mojo/examples/content_handler_demo/content_handler_demo.cc b/mojo/examples/content_handler_demo/content_handler_demo.cc
index 21864f75f474e90f1a2a301190334f799a4932a5..97b8cb5dc0ee63468c2bfb5cea793ada5c99c911 100644
--- a/mojo/examples/content_handler_demo/content_handler_demo.cc
+++ b/mojo/examples/content_handler_demo/content_handler_demo.cc
@@ -22,9 +22,10 @@ class ContentHandlerImpl : public InterfaceImpl<ContentHandler> {
   virtual ~ContentHandlerImpl() {}
 
  private:
-  virtual void OnConnect(const mojo::String& url,
-                         URLResponsePtr content,
-                         ServiceProviderPtr service_provider) MOJO_OVERRIDE;
+  virtual void OnConnect(
+      const mojo::String& url,
+      ContentHandlerResponsePtr content,
+      InterfaceRequest<ServiceProvider> service_provider) MOJO_OVERRIDE;
 
   ContentHandlerApp* content_handler_app_;
 };
@@ -71,12 +72,13 @@ class ContentHandlerApp : public ApplicationDelegate {
                                   ContentHandlerApp> content_handler_factory_;
 };
 
-void ContentHandlerImpl::OnConnect(const mojo::String& url,
-                                   URLResponsePtr content,
-                                   ServiceProviderPtr service_provider) {
+void ContentHandlerImpl::OnConnect(
+    const mojo::String& url,
+    ContentHandlerResponsePtr content,
+    InterfaceRequest<ServiceProvider> service_provider) {
   printf("ContentHandler::OnConnect - url:%s - body follows\n\n",
          url.To<std::string>().c_str());
-  content_handler_app_->PrintResponse(content->body.Pass());
+  content_handler_app_->PrintResponse(content->response->body.Pass());
 }
 
 }  // namespace examples