Added URLRequestContext to constructor for URLRequest.

content/browser/renderer_host/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/renderer_host/resource_dispatcher_host_impl.h"
 
 #include <set>
 #include <vector>
@@ skipping 474 matching lines @@
     return CallbackAndReturn(started_callback, net::ERR_INSUFFICIENT_RESOURCES);
 
   const GURL& url = request->original_url();
 
   // http://crbug.com/90971
   char url_buf[128];
   base::strlcpy(url_buf, url.spec().c_str(), arraysize(url_buf));
   base::debug::Alias(url_buf);
   CHECK(ContainsKey(active_resource_contexts_, context));
 
   const net::URLRequestContext* request_context = context->GetRequestContext();

[erikwright (departed), 2012/06/19 21:06:22]

this is now used exclusively on line 529, so do it there, and via
request->context()

[shalev, 2012/06/20 20:13:12]

Done.

   request->set_referrer(MaybeStripReferrer(GURL(request->referrer())).spec());
-  request->set_context(request_context);
   int extra_load_flags = net::LOAD_IS_DOWNLOAD;
   if (prefer_cache) {
     // If there is upload data attached, only retrieve from cache because there
     // is no current mechanism to prompt the user for their consent for a
     // re-post. For GETs, try to retrieve data from the cache and skip
     // validating the entry if present.
     if (request->get_upload() != NULL)
       extra_load_flags |= net::LOAD_ONLY_FROM_CACHE;
     else
       extra_load_flags |= net::LOAD_PREFERRING_CACHE;
@@ skipping 288 matching lines @@
           *resource_context->GetRequestContext()->job_factory(),
           handler.get())) {
     return;
   }
 
   // Construct the request.
   net::URLRequest* request;
   if (deferred_request) {
     request = deferred_request;
   } else {
-    request = new net::URLRequest(request_data.url, this);
+    request = new net::URLRequest(
+        request_data.url,
+        this,
+        filter_->GetURLRequestContext(request_data.resource_type));
     request->set_method(request_data.method);
     request->set_first_party_for_cookies(request_data.first_party_for_cookies);
     request->set_referrer(referrer.url.spec());
     webkit_glue::ConfigureURLRequestForReferrerPolicy(request, referrer.policy);
     net::HttpRequestHeaders headers;
     headers.AddHeadersFromString(request_data.headers);
     request->SetExtraRequestHeaders(headers);
   }
 
   int load_flags = request_data.load_flags;
@@ skipping 26 matching lines @@
   // Raw headers are sensitive, as they include Cookie/Set-Cookie, so only
   // allow requesting them if requester has ReadRawCookies permission.
   if ((load_flags & net::LOAD_REPORT_RAW_HEADERS)
       && !policy->CanReadRawCookies(child_id)) {
     VLOG(1) << "Denied unauthorized request for raw headers";
     load_flags &= ~net::LOAD_REPORT_RAW_HEADERS;
   }
 
   request->set_load_flags(load_flags);
 
-  request->set_context(
-      filter_->GetURLRequestContext(request_data.resource_type));
   request->set_priority(DetermineRequestPriority(request_data.resource_type));
 
   // Set upload data.
   uint64 upload_size = 0;
   if (request_data.upload_data) {
     request->set_upload(request_data.upload_data);
     // This results in performing file IO. crbug.com/112607.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     upload_size = request_data.upload_data->GetContentLengthSync();
   }
@@ skipping 301 matching lines @@
   bool known_proto =
       request_context->job_factory()->IsHandledURL(url);
   if (!known_proto) {
     // Since any URLs which have non-standard scheme have been filtered
     // by save manager(see GURL::SchemeIsStandard). This situation
     // should not happen.
     NOTREACHED();
     return;
   }
 
-  net::URLRequest* request = new net::URLRequest(url, this);
+  net::URLRequest* request = new net::URLRequest(url,
+                                                 this,
+                                                 context->GetRequestContext());

[erikwright (departed), 2012/06/19 21:06:22]

access this via request_context local variable.

[shalev, 2012/06/20 20:13:12]

Done.

   request->set_method("GET");
   request->set_referrer(MaybeStripReferrer(referrer.url).spec());
   webkit_glue::ConfigureURLRequestForReferrerPolicy(request, referrer.policy);
   // So far, for saving page, we need fetch content from cache, in the
   // future, maybe we can use a configuration to configure this behavior.
   request->set_load_flags(net::LOAD_PREFERRING_CACHE);
-  request->set_context(context->GetRequestContext());
 
   // Since we're just saving some resources we need, disallow downloading.
   ResourceRequestInfoImpl* extra_info =
       CreateRequestInfo(handler.Pass(), child_id, route_id, false, context);
   extra_info->AssociateWithRequest(request);  // Request takes ownership.
 
   BeginRequestInternal(request);
 }
 
 void ResourceDispatcherHostImpl::FollowDeferredRedirect(
@@ skipping 1165 matching lines @@
   return allow_cross_origin_auth_prompt_;
 }
 
 bool ResourceDispatcherHostImpl::IsTransferredNavigation(
     const GlobalRequestID& transferred_request_id) const {
   return transferred_navigations_.find(transferred_request_id) !=
       transferred_navigations_.end();
 }
 
 }  // namespace content