Fix bug where we'd allow chrome-extension URLs to be loaded in incognito mode

content/browser/renderer_host/resource_request_info_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.
 
 #include "content/browser/renderer_host/resource_request_info_impl.h"
 
 #include "content/browser/renderer_host/resource_handler.h"
 #include "content/browser/ssl/ssl_client_auth_handler.h"
 #include "content/browser/worker_host/worker_service_impl.h"
 #include "content/common/net/url_request_user_data.h"
 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
 #include "net/url_request/url_request.h"
 #include "webkit/blob/blob_data.h"
 
 namespace content {
 
 // ----------------------------------------------------------------------------
 // ResourceRequestInfo
 
 // static
 const ResourceRequestInfo* ResourceRequestInfo::ForRequest(
     const net::URLRequest* request) {
   return ResourceRequestInfoImpl::ForRequest(request);
 }
 
 // static
 void ResourceRequestInfo::AllocateForTesting(
     net::URLRequest* request,
+    ResourceType::Type resource_type,
     ResourceContext* context) {
   ResourceRequestInfoImpl* info =
       new ResourceRequestInfoImpl(
           NULL,                              // handler
           PROCESS_TYPE_RENDERER,             // process_type
           -1,                                // child_id
           MSG_ROUTING_NONE,                  // route_id
           0,                                 // origin_pid
           0,                                 // request_id
-          true,                              // is_main_frame
+          resource_type == ResourceType::MAIN_FRAME,  // is_main_frame
           0,                                 // frame_id
           false,                             // parent_is_main_frame
           0,                                 // parent_frame_id
-          ResourceType::MAIN_FRAME,          // resource_type
+          resource_type,                     // resource_type
           PAGE_TRANSITION_LINK,              // transition_type
           0,                                 // upload_size
           false,                             // is_download
           true,                              // allow_download
           false,                             // has_user_gesture
           WebKit::WebReferrerPolicyDefault,  // referrer_policy
           context);                          // context
   info->AssociateWithRequest(request);
 }
 
@@ skipping 173 matching lines @@
     SSLClientAuthHandler* s) {
   ssl_client_auth_handler_ = s;
 }
 
 void ResourceRequestInfoImpl::set_requested_blob_data(
     webkit_blob::BlobData* data) {
   requested_blob_data_ = data;
 }
 
 }  // namespace content