network service: pass PlzNavigate resulting data via mojo data pipe

content/browser/loader/navigation_url_loader_network_service.cc

 // Copyright 2017 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 "content/browser/loader/navigation_url_loader_network_service.h"
 
 #include "base/memory/ptr_util.h"
 #include "content/browser/frame_host/navigation_request_info.h"
 #include "content/browser/loader/navigation_url_loader_delegate.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/global_request_id.h"
+#include "content/public/browser/navigation_data.h"
 #include "content/public/browser/navigation_ui_data.h"
+#include "content/public/browser/ssl_status.h"
+#include "content/public/browser/stream_handle.h"
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/common/service_names.mojom.h"
 #include "net/url_request/url_request_context.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 namespace content {
 
 NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
     ResourceContext* resource_context,
     StoragePartition* storage_partition,
@@ skipping 33 matching lines @@
 
 void NavigationURLLoaderNetworkService::FollowRedirect() {
   url_loader_associated_ptr_->FollowRedirect();
 }
 
 void NavigationURLLoaderNetworkService::ProceedWithResponse() {}
 
 void NavigationURLLoaderNetworkService::OnReceiveResponse(
     const ResourceResponseHead& head,
     mojom::DownloadedTempFilePtr downloaded_file) {
-  // TODO(scottmg): This should mirror code in
-  // NavigationResourceHandler::OnReponseStarted().
+  // TODO(scottmg): This needs to do more of what
+  // NavigationResourceHandler::OnReponseStarted() does. Or maybe in
+  // OnStartLoadingResponseBody().
+  response_ = new ResourceResponse();

[dcheng, 2017/04/12 21:18:16]

Nit: base::MakeShared<ResourceResponse>();

[scottmg, 2017/04/12 21:28:50]

Doh, more of them! Done.

(For my edification... I can see the upside in the last CL of MakeUnique for
locals, etc. since there's less repetition of the typename... why is MakeShared
preferable here?)

[dcheng, 2017/04/12 21:31:11]

in my opinion, it's nice not to have a bare new, since a reader doesn't have to
check to see if the field is a raw pointer, scoped_refptr, or something else.

[scottmg, 2017/04/12 21:35:28]

so ideally someday, the only bare 'new's would represent raw pointers in your
imagining? makes sense, thanks.

+  response_->head = head;
 }
 
 void NavigationURLLoaderNetworkService::OnReceiveRedirect(
     const net::RedirectInfo& redirect_info,
     const ResourceResponseHead& head) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   scoped_refptr<ResourceResponse> response(new ResourceResponse());
   response->head = head;
   delegate_->OnRequestRedirected(redirect_info, response);
 }
 
 void NavigationURLLoaderNetworkService::OnDataDownloaded(
     int64_t data_length,
     int64_t encoded_length) {}
 
 void NavigationURLLoaderNetworkService::OnUploadProgress(
     int64_t current_position,
     int64_t total_size,
     const OnUploadProgressCallback& callback) {}
 
 void NavigationURLLoaderNetworkService::OnReceiveCachedMetadata(
     const std::vector<uint8_t>& data) {}
 
 void NavigationURLLoaderNetworkService::OnTransferSizeUpdated(
     int32_t transfer_size_diff) {}
 
 void NavigationURLLoaderNetworkService::OnStartLoadingResponseBody(
-    mojo::ScopedDataPipeConsumerHandle body) {}
+    mojo::ScopedDataPipeConsumerHandle body) {
+  DCHECK(response_);
+  // Temporarily, we pass both a stream (null) and the data pipe to the
+  // delegate until PlzNavigate has shipped and we can be comfortable fully
+  // switching to the data pipe.
+  delegate_->OnResponseStarted(
+      response_, std::unique_ptr<StreamHandle>(), std::move(body), SSLStatus(),

[dcheng, 2017/04/12 21:18:16]

Nit: nullptr

[scottmg, 2017/04/12 21:28:50]

Done.

+      std::unique_ptr<NavigationData>(), GlobalRequestID() /* request_id? */,
+      false /* is_download? */, false /* is_stream */);
+}
 
 void NavigationURLLoaderNetworkService::OnComplete(
     const ResourceRequestCompletionStatus& completion_status) {}
 
 }  // namespace content