Introduce a secondary map for enabling plznavigate

android_webview/browser/net/aw_request_interceptor.cc

 // Copyright (c) 2012 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 "android_webview/browser/net/aw_request_interceptor.h"
 
 #include <utility>
 
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/input_stream.h"
 #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
 #include "android_webview/browser/net/aw_web_resource_response.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_request_info.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_job.h"
+#include "url/url_constants.h"
 
 namespace android_webview {
 
 namespace {
 
 const void* const kRequestAlreadyHasJobDataKey = &kRequestAlreadyHasJobDataKey;
 
 class StreamReaderJobDelegateImpl
     : public AndroidStreamReaderURLRequestJob::Delegate {
  public:
@@ skipping 81 matching lines @@
   Callback callback_;
   base::WeakPtrFactory<ShouldInterceptRequestAdaptor> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShouldInterceptRequestAdaptor);
 };
 
 std::unique_ptr<AwContentsIoThreadClient> GetCorrespondingIoThreadClient(
     net::URLRequest* request) {
   if (content::ResourceRequestInfo::OriginatedFromServiceWorker(request))
     return AwContentsIoThreadClient::GetServiceWorkerIoThreadClient();
-
   int render_process_id, render_frame_id;
   if (!content::ResourceRequestInfo::GetRenderFrameForRequest(
       request, &render_process_id, &render_frame_id)) {
     return nullptr;
   }
 
+  if (render_process_id == -1 || render_frame_id == -1) {

[jam, 2017/03/09 22:13:05]

since this block (and rest of method) is duplicated in
aw_resource_dispatcher_host_delegate.cc, can this be moved into a static method
in AwContentsIoThreadClient? Even better if we can hide the existing two that
take in RPH/RFH and force people to pass in a net::URLRequest or
content::ResourceRequestInfo; that way we ensure that we won't gain new
callsites in the future that fail for navigation requests

[jam, 2017/03/10 17:08:44]

Ok ignore this comment, I looked through the usage of
AwContentsIoThreadClient::FromID and the cookie one has to send RPH/RFH IDs
since it's in response to the renderer which doesn't have a net::URLRequest (and
it's fine with PlzNavigate).

[sgurun-gerrit only, 2017/03/10 18:40:58]

Acknowledged. 

+    const content::ResourceRequestInfo* resourceRequestInfo =
+        content::ResourceRequestInfo::ForRequest(request);
+    if (resourceRequestInfo == nullptr) {
+      return nullptr;
+    }
+    return AwContentsIoThreadClient::FromID(
+        resourceRequestInfo->GetFrameTreeNodeId());
+  }
+
   return AwContentsIoThreadClient::FromID(render_process_id, render_frame_id);
 }
 
 }  // namespace
 
 AwRequestInterceptor::AwRequestInterceptor() {}
 
 AwRequestInterceptor::~AwRequestInterceptor() {}
 
 net::URLRequestJob* AwRequestInterceptor::MaybeInterceptRequest(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   // MaybeInterceptRequest can be called multiple times for the same request.
   if (request->GetUserData(kRequestAlreadyHasJobDataKey))
     return nullptr;
 
+  if (request->url().SchemeIs(url::kBlobScheme)) {

[jam, 2017/03/09 22:13:05]

comment?

[sgurun-gerrit only, 2017/03/10 18:40:58]

Done.

+    return nullptr;
+  }
+
   std::unique_ptr<AwContentsIoThreadClient> io_thread_client =
       GetCorrespondingIoThreadClient(request);
 
   if (!io_thread_client)
     return nullptr;
 
   GURL referrer(request->referrer());
   if (referrer.is_valid() &&
       (!request->is_pending() || request->is_redirecting())) {
     request->SetExtraRequestHeaderByName(net::HttpRequestHeaders::kReferer,
                                          referrer.spec(), true);
   }
   request->SetUserData(kRequestAlreadyHasJobDataKey,
                        new base::SupportsUserData::Data());
   return new AndroidStreamReaderURLRequestJob(
       request, network_delegate,
       base::MakeUnique<ShouldInterceptRequestAdaptor>(
           std::move(io_thread_client)),
       true);
 }
 
 }  // namespace android_webview