Fixes for the failing URLLoaderFactoryImplTest content_unittests with PlzNavigate enabled

content/browser/loader/resource_dispatcher_host_impl.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 
 #include <stddef.h>
 
@@ skipping 1264 matching lines @@
   if (IsRequestIDInUse(GlobalRequestID(child_id, request_id))) {
     bad_message::ReceivedBadMessage(filter_,
                                     bad_message::RDH_INVALID_REQUEST_ID);
     return;
   }
 
   // PlzNavigate: reject invalid renderer main resource request.
   bool is_navigation_stream_request =
       IsBrowserSideNavigationEnabled() &&
       IsResourceTypeFrame(request_data.resource_type);
-  if (is_navigation_stream_request &&
-      !request_data.resource_body_stream_url.SchemeIs(url::kBlobScheme)) {
+  // The process_type check is to ensure that we don't block unittests from

[clamy, 2016/08/25 23:14:04]

nit: s/we don't block unittests/unittests are not blocked

[ananta, 2016/08/25 23:39:20]

Done.

+  // issuing http requests.
+  if ((process_type == PROCESS_TYPE_RENDERER) && is_navigation_stream_request
+       && !request_data.resource_body_stream_url.SchemeIs(url::kBlobScheme)) {
     bad_message::ReceivedBadMessage(filter_, bad_message::RDH_INVALID_URL);
     return;
   }
 
   // Reject invalid priority.
   if (request_data.priority < net::MINIMUM_PRIORITY ||
       request_data.priority > net::MAXIMUM_PRIORITY) {
     bad_message::ReceivedBadMessage(filter_, bad_message::RDH_INVALID_PRIORITY);
     return;
   }
@@ skipping 94 matching lines @@
     AbortRequestBeforeItStarts(filter_, sync_result, request_id,
                                std::move(url_loader_client));
     return;
   }
 
   int process_type = filter_->process_type();
   int child_id = filter_->child_id();
 
   bool is_navigation_stream_request =
       IsBrowserSideNavigationEnabled() &&
-      IsResourceTypeFrame(request_data.resource_type);
+      IsResourceTypeFrame(request_data.resource_type) &&
+      process_type == PROCESS_TYPE_RENDERER;
 
   ResourceContext* resource_context = NULL;
   net::URLRequestContext* request_context = NULL;
   filter_->GetContexts(request_data.resource_type, &resource_context,
                        &request_context);
 
   // Allow the observer to block/handle the request.
   if (delegate_ && !delegate_->ShouldBeginRequest(request_data.method,
                                                   request_data.url,
                                                   request_data.resource_type,
@@ skipping 268 matching lines @@
     ResourceType resource_type,
     ResourceContext* resource_context,
     RequestContextType fetch_request_context_type,
     AppCacheService* appcache_service,
     int child_id,
     int route_id,
     std::unique_ptr<ResourceHandler> handler) {
   // PlzNavigate: do not add ResourceThrottles for main resource requests from
   // the renderer.  Decisions about the navigation should have been done in the
   // initial request.
-  if (IsBrowserSideNavigationEnabled() && IsResourceTypeFrame(resource_type) &&
-      child_id != -1) {
+  bool is_renderer =
+      filter_ ? (filter_->process_type() == PROCESS_TYPE_RENDERER) : false;

[clamy, 2016/08/25 23:14:04]

nit: The child_id != -1 below also checks if this is a renderer-initiated
request. I think it can be removed from the condition.

[ananta, 2016/08/25 23:39:20]

Done.

+  if (is_renderer && IsBrowserSideNavigationEnabled() &&
+      IsResourceTypeFrame(resource_type) && child_id != -1) {
     DCHECK(request->url().SchemeIs(url::kBlobScheme));
     return handler;
   }
 
   PluginService* plugin_service = nullptr;
 #if defined(ENABLE_PLUGINS)
   plugin_service = PluginService::GetInstance();
 #endif
   // Insert a buffered event handler before the actual one.
   handler.reset(new MimeTypeResourceHandler(std::move(handler), this,
@@ skipping 1017 matching lines @@
                        << iter->filesystem_url().spec();
           return false;
         }
       }
     }
   }
   return true;
 }
 
 }  // namespace content