Mojo: Refactor URLLoader interface.

mojo/examples/html_viewer/html_viewer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/examples/html_viewer/blink_platform_impl.h"
 #include "mojo/examples/html_viewer/html_document_view.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/services/public/cpp/view_manager/node.h"
@@ skipping 29 matching lines @@
 
 class HTMLViewer : public ApplicationDelegate,
                    public view_manager::ViewManagerDelegate {
  public:
   HTMLViewer() : application_impl_(NULL), document_view_(NULL) {
   }
   virtual ~HTMLViewer() {
     blink::shutdown();
   }
 
-  void Load(URLResponsePtr response,
-            ScopedDataPipeConsumerHandle response_body_stream) {
+  void Load(URLResponsePtr response) {
     // Need to wait for OnRootAdded.
     response_ = response.Pass();
-    response_body_stream_ = response_body_stream.Pass();
     MaybeLoad();
   }
 
  private:
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) OVERRIDE {
     application_impl_ = app;
     blink_platform_impl_.reset(new BlinkPlatformImpl(app));
     blink::initialize(blink_platform_impl_.get());
   }
@@ skipping 10 matching lines @@
                            view_manager::Node* root) OVERRIDE {
     document_view_ = new HTMLDocumentView(
         application_impl_->ConnectToApplication("mojo://mojo_window_manager/")->
             GetServiceProvider(), view_manager);
     document_view_->AttachToNode(root);
     MaybeLoad();
   }
 
   void MaybeLoad() {
     if (document_view_ && response_.get())
-      document_view_->Load(response_.Pass(), response_body_stream_.Pass());
+      document_view_->Load(response_.Pass());
   }
 
   scoped_ptr<BlinkPlatformImpl> blink_platform_impl_;
   ApplicationImpl* application_impl_;
 
   // TODO(darin): Figure out proper ownership of this instance.
   HTMLDocumentView* document_view_;
   URLResponsePtr response_;
-  ScopedDataPipeConsumerHandle response_body_stream_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
 };
 
 void NavigatorImpl::Navigate(
     uint32_t node_id,
     navigation::NavigationDetailsPtr navigation_details,
     navigation::ResponseDetailsPtr response_details) {
   printf("In HTMLViewer, rendering url: %s\n",
       response_details->response->url.data());
-  viewer_->Load(response_details->response.Pass(),
-                response_details->response_body_stream.Pass());
+  viewer_->Load(response_details->response.Pass());
 }
 
 }
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::HTMLViewer;
 }
 
 }