Mojo: Refactor URLLoader interface.

mojo/services/public/interfaces/navigation/navigation.mojom

 // 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.
 
 import "mojo/services/public/interfaces/network/url_loader.mojom"
 
 module mojo.navigation {
 
 // Expresses a preference for where a navigation will be performed.
 enum Target {
   // No preference
   DEFAULT,
 
   // In the same ViewManager node that the navigation was initiated
   SOURCE_NODE,
 
   // In a new ViewManager node
   NEW_NODE
 };
 
 struct NavigationDetails {
   string url;
   // TODO(aa): method, data, etc.
 };
 
 struct ResponseDetails {
   // TODO(beng): consider providing access to URLRequest too. Currently it is
   //             not possible to obtain from the URLLoader.
+
+  // The URLLoader instance that generated the response. This must be kept
+  // alive until the response body has been completely consumed.
+  // TODO(darin): This should be |mojo.URLLoader loader|. See crbug/392693.
+  handle<message_pipe> loader_handle;
+
   mojo.URLResponse response;
-  handle<data_pipe_consumer> response_body_stream;
 };
 
 // Embedders that support navigation of implement this interface.
 interface NavigatorHost {
   RequestNavigate(uint32 source_node_id, Target target,
                   NavigationDetails details);
 
   // Applications call this to inform hosts of navigations they performed
   // locally. For example, pushState() navigations in an HTML application.
   DidNavigateLocally(uint32 source_node_id, string url);
 };
 
 // Applications implement this interface to support navigation of their views
 // by embedders.
 // |response_details| can be NULL when a navigation was not the result of a
 // network load.
 interface Navigator {
   Navigate(uint32 node_id,
            NavigationDetails navigation_details,
            ResponseDetails response_details);
 };
 
 }