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

Side by Side Diff: webkit/tools/test_shell/simple_resource_loader_bridge.cc

Issue 10870060: Removed calls to URLRequest::URLRequest in favor of URLRequestContext::CreateRequest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged 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 | Annotate | Revision Log
« no previous file with comments | « webkit/fileapi/local_file_system_operation.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // This file contains an implementation of the ResourceLoaderBridge class. 5 // This file contains an implementation of the ResourceLoaderBridge class.
6 // The class is implemented using net::URLRequest, meaning it is a "simple" 6 // The class is implemented using net::URLRequest, meaning it is a "simple"
7 // version that directly issues requests. The more complicated one used in the 7 // version that directly issues requests. The more complicated one used in the
8 // browser uses IPC. 8 // browser uses IPC.
9 // 9 //
10 // Because net::URLRequest only provides an asynchronous resource loading API, 10 // Because net::URLRequest only provides an asynchronous resource loading API,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "net/base/net_errors.h" 52 #include "net/base/net_errors.h"
53 #include "net/base/net_util.h" 53 #include "net/base/net_util.h"
54 #include "net/base/network_delegate.h" 54 #include "net/base/network_delegate.h"
55 #include "net/base/static_cookie_policy.h" 55 #include "net/base/static_cookie_policy.h"
56 #include "net/base/upload_data.h" 56 #include "net/base/upload_data.h"
57 #include "net/cookies/cookie_store.h" 57 #include "net/cookies/cookie_store.h"
58 #include "net/http/http_cache.h" 58 #include "net/http/http_cache.h"
59 #include "net/http/http_request_headers.h" 59 #include "net/http/http_request_headers.h"
60 #include "net/http/http_response_headers.h" 60 #include "net/http/http_response_headers.h"
61 #include "net/url_request/url_request.h" 61 #include "net/url_request/url_request.h"
62 #include "net/url_request/url_request_context.h"
62 #include "net/url_request/url_request_job.h" 63 #include "net/url_request/url_request_job.h"
63 #include "webkit/appcache/appcache_interfaces.h" 64 #include "webkit/appcache/appcache_interfaces.h"
64 #include "webkit/blob/blob_storage_controller.h" 65 #include "webkit/blob/blob_storage_controller.h"
65 #include "webkit/blob/blob_url_request_job.h" 66 #include "webkit/blob/blob_url_request_job.h"
66 #include "webkit/blob/shareable_file_reference.h" 67 #include "webkit/blob/shareable_file_reference.h"
67 #include "webkit/fileapi/file_system_context.h" 68 #include "webkit/fileapi/file_system_context.h"
68 #include "webkit/fileapi/file_system_dir_url_request_job.h" 69 #include "webkit/fileapi/file_system_dir_url_request_job.h"
69 #include "webkit/fileapi/file_system_url_request_job.h" 70 #include "webkit/fileapi/file_system_url_request_job.h"
70 #include "webkit/glue/resource_loader_bridge.h" 71 #include "webkit/glue/resource_loader_bridge.h"
71 #include "webkit/glue/resource_request_body.h" 72 #include "webkit/glue/resource_request_body.h"
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 void NotifyUploadProgress(uint64 position, uint64 size) { 410 void NotifyUploadProgress(uint64 position, uint64 size) {
410 if (peer_) 411 if (peer_)
411 peer_->OnUploadProgress(position, size); 412 peer_->OnUploadProgress(position, size);
412 } 413 }
413 414
414 // -------------------------------------------------------------------------- 415 // --------------------------------------------------------------------------
415 // The following methods are called on the io thread. They correspond to 416 // The following methods are called on the io thread. They correspond to
416 // actions performed on the owner's thread. 417 // actions performed on the owner's thread.
417 418
418 void AsyncStart(RequestParams* params) { 419 void AsyncStart(RequestParams* params) {
419 request_.reset(new net::URLRequest(params->url, this, g_request_context)); 420 request_.reset(g_request_context->CreateRequest(params->url, this));
420 request_->set_method(params->method); 421 request_->set_method(params->method);
421 request_->set_first_party_for_cookies(params->first_party_for_cookies); 422 request_->set_first_party_for_cookies(params->first_party_for_cookies);
422 request_->set_referrer(params->referrer.spec()); 423 request_->set_referrer(params->referrer.spec());
423 webkit_glue::ConfigureURLRequestForReferrerPolicy( 424 webkit_glue::ConfigureURLRequestForReferrerPolicy(
424 request_.get(), params->referrer_policy); 425 request_.get(), params->referrer_policy);
425 net::HttpRequestHeaders headers; 426 net::HttpRequestHeaders headers;
426 headers.AddHeadersFromString(params->headers); 427 headers.AddHeadersFromString(params->headers);
427 request_->SetExtraRequestHeaders(headers); 428 request_->SetExtraRequestHeaders(headers);
428 request_->set_load_flags(params->load_flags); 429 request_->set_load_flags(params->load_flags);
429 if (params->request_body) { 430 if (params->request_body) {
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 (http_prefix.SchemeIs("http") || http_prefix.SchemeIs("https"))); 1108 (http_prefix.SchemeIs("http") || http_prefix.SchemeIs("https")));
1108 g_file_over_http_params = new FileOverHTTPParams(file_path_template, 1109 g_file_over_http_params = new FileOverHTTPParams(file_path_template,
1109 http_prefix); 1110 http_prefix);
1110 } 1111 }
1111 1112
1112 // static 1113 // static
1113 webkit_glue::ResourceLoaderBridge* SimpleResourceLoaderBridge::Create( 1114 webkit_glue::ResourceLoaderBridge* SimpleResourceLoaderBridge::Create(
1114 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) { 1115 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
1115 return new ResourceLoaderBridgeImpl(request_info); 1116 return new ResourceLoaderBridgeImpl(request_info);
1116 } 1117 }
OLDNEW
« no previous file with comments | « webkit/fileapi/local_file_system_operation.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698