Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: content/browser/renderer_host/resource_dispatcher_host_impl.cc

Issue 10910044: Removed calls to URLRequest::URLRequest in favor of URLRequestContext::CreateRequest (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
6 6
7 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" 7 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 915 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 // Construct the request. 926 // Construct the request.
927 scoped_ptr<net::URLRequest> new_request; 927 scoped_ptr<net::URLRequest> new_request;
928 net::URLRequest* request; 928 net::URLRequest* request;
929 if (deferred_loader.get()) { 929 if (deferred_loader.get()) {
930 request = deferred_loader->request(); 930 request = deferred_loader->request();
931 931
932 // Give the ResourceLoader (or any of the ResourceHandlers held by it) a 932 // Give the ResourceLoader (or any of the ResourceHandlers held by it) a
933 // chance to reset some state before we complete the transfer. 933 // chance to reset some state before we complete the transfer.
934 deferred_loader->WillCompleteTransfer(); 934 deferred_loader->WillCompleteTransfer();
935 } else { 935 } else {
936 new_request.reset(new net::URLRequest( 936 net::URLRequestContext* context =
937 request_data.url, 937 filter_->GetURLRequestContext(request_data.resource_type);
938 NULL, 938 new_request.reset(context->CreateRequest(request_data.url, NULL));
939 filter_->GetURLRequestContext(request_data.resource_type)));
940 request = new_request.get(); 939 request = new_request.get();
941 940
942 request->set_method(request_data.method); 941 request->set_method(request_data.method);
943 request->set_first_party_for_cookies(request_data.first_party_for_cookies); 942 request->set_first_party_for_cookies(request_data.first_party_for_cookies);
944 request->set_referrer(referrer.url.spec()); 943 request->set_referrer(referrer.url.spec());
945 webkit_glue::ConfigureURLRequestForReferrerPolicy(request, 944 webkit_glue::ConfigureURLRequestForReferrerPolicy(request,
946 referrer.policy); 945 referrer.policy);
947 net::HttpRequestHeaders headers; 946 net::HttpRequestHeaders headers;
948 headers.AddHeadersFromString(request_data.headers); 947 headers.AddHeadersFromString(request_data.headers);
949 request->SetExtraRequestHeaders(headers); 948 request->SetExtraRequestHeaders(headers);
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1249 request_context->job_factory()->IsHandledURL(url); 1248 request_context->job_factory()->IsHandledURL(url);
1250 if (!known_proto) { 1249 if (!known_proto) {
1251 // Since any URLs which have non-standard scheme have been filtered 1250 // Since any URLs which have non-standard scheme have been filtered
1252 // by save manager(see GURL::SchemeIsStandard). This situation 1251 // by save manager(see GURL::SchemeIsStandard). This situation
1253 // should not happen. 1252 // should not happen.
1254 NOTREACHED(); 1253 NOTREACHED();
1255 return; 1254 return;
1256 } 1255 }
1257 1256
1258 scoped_ptr<net::URLRequest> request( 1257 scoped_ptr<net::URLRequest> request(
1259 new net::URLRequest(url, NULL, request_context)); 1258 request_context->CreateRequest(url, NULL));
1260 request->set_method("GET"); 1259 request->set_method("GET");
1261 request->set_referrer(MaybeStripReferrer(referrer.url).spec()); 1260 request->set_referrer(MaybeStripReferrer(referrer.url).spec());
1262 webkit_glue::ConfigureURLRequestForReferrerPolicy(request.get(), 1261 webkit_glue::ConfigureURLRequestForReferrerPolicy(request.get(),
1263 referrer.policy); 1262 referrer.policy);
1264 // So far, for saving page, we need fetch content from cache, in the 1263 // So far, for saving page, we need fetch content from cache, in the
1265 // future, maybe we can use a configuration to configure this behavior. 1264 // future, maybe we can use a configuration to configure this behavior.
1266 request->set_load_flags(net::LOAD_PREFERRING_CACHE); 1265 request->set_load_flags(net::LOAD_PREFERRING_CACHE);
1267 1266
1268 // Since we're just saving some resources we need, disallow downloading. 1267 // Since we're just saving some resources we need, disallow downloading.
1269 ResourceRequestInfoImpl* extra_info = 1268 ResourceRequestInfoImpl* extra_info =
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
1722 1721
1723 return i->second.get(); 1722 return i->second.get();
1724 } 1723 }
1725 1724
1726 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id, 1725 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id,
1727 int request_id) const { 1726 int request_id) const {
1728 return GetLoader(GlobalRequestID(child_id, request_id)); 1727 return GetLoader(GlobalRequestID(child_id, request_id));
1729 } 1728 }
1730 1729
1731 } // namespace content 1730 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_message_filter.cc ('k') | webkit/appcache/appcache_update_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698