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

Side by Side Diff: chrome/browser/automation/url_request_automation_job.cc

Issue 10918279: Provide mutable members of UrlRequestContext via pure-virtual interface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable test for chrome_frame_net_tests Created 8 years, 1 month 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 | « chrome/browser/automation/url_request_automation_job.h ('k') | chrome/browser/io_thread.h » ('j') | 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 #include "chrome/browser/automation/url_request_automation_job.h" 5 #include "chrome/browser/automation/url_request_automation_job.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/time.h" 10 #include "base/time.h"
11 #include "chrome/browser/automation/automation_resource_message_filter.h" 11 #include "chrome/browser/automation/automation_resource_message_filter.h"
12 #include "chrome/common/automation_messages.h" 12 #include "chrome/common/automation_messages.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "content/public/browser/render_view_host.h" 14 #include "content/public/browser/render_view_host.h"
15 #include "content/public/browser/resource_request_info.h" 15 #include "content/public/browser/resource_request_info.h"
16 #include "net/base/host_port_pair.h" 16 #include "net/base/host_port_pair.h"
17 #include "net/base/io_buffer.h" 17 #include "net/base/io_buffer.h"
18 #include "net/base/net_errors.h" 18 #include "net/base/net_errors.h"
19 #include "net/cookies/cookie_monster.h" 19 #include "net/cookies/cookie_monster.h"
20 #include "net/http/http_request_headers.h" 20 #include "net/http/http_request_headers.h"
21 #include "net/http/http_response_headers.h" 21 #include "net/http/http_response_headers.h"
22 #include "net/http/http_util.h" 22 #include "net/http/http_util.h"
23 #include "net/url_request/http_user_agent_settings.h"
23 #include "net/url_request/url_request.h" 24 #include "net/url_request/url_request.h"
24 #include "net/url_request/url_request_context.h" 25 #include "net/url_request/url_request_context.h"
25 26
26 using base::Time; 27 using base::Time;
27 using base::TimeDelta; 28 using base::TimeDelta;
28 using content::BrowserThread; 29 using content::BrowserThread;
29 using content::ResourceRequestInfo; 30 using content::ResourceRequestInfo;
30 31
31 // The list of filtered headers that are removed from requests sent via 32 // The list of filtered headers that are removed from requests sent via
32 // StartAsync(). These must be lower case. 33 // StartAsync(). These must be lower case.
(...skipping 13 matching lines...) Expand all
46 bool URLRequestAutomationJob::is_protocol_factory_registered_ = false; 47 bool URLRequestAutomationJob::is_protocol_factory_registered_ = false;
47 48
48 net::URLRequest::ProtocolFactory* URLRequestAutomationJob::old_http_factory_ 49 net::URLRequest::ProtocolFactory* URLRequestAutomationJob::old_http_factory_
49 = NULL; 50 = NULL;
50 net::URLRequest::ProtocolFactory* URLRequestAutomationJob::old_https_factory_ 51 net::URLRequest::ProtocolFactory* URLRequestAutomationJob::old_https_factory_
51 = NULL; 52 = NULL;
52 53
53 URLRequestAutomationJob::URLRequestAutomationJob( 54 URLRequestAutomationJob::URLRequestAutomationJob(
54 net::URLRequest* request, 55 net::URLRequest* request,
55 net::NetworkDelegate* network_delegate, 56 net::NetworkDelegate* network_delegate,
57 const net::HttpUserAgentSettings* http_user_agent_settings,
56 int tab, 58 int tab,
57 int request_id, 59 int request_id,
58 AutomationResourceMessageFilter* filter, 60 AutomationResourceMessageFilter* filter,
59 bool is_pending) 61 bool is_pending)
60 : net::URLRequestJob(request, network_delegate), 62 : net::URLRequestJob(request, network_delegate),
63 http_user_agent_settings_(http_user_agent_settings),
61 id_(0), 64 id_(0),
62 tab_(tab), 65 tab_(tab),
63 message_filter_(filter), 66 message_filter_(filter),
64 pending_buf_size_(0), 67 pending_buf_size_(0),
65 redirect_status_(0), 68 redirect_status_(0),
66 request_id_(request_id), 69 request_id_(request_id),
67 is_pending_(is_pending), 70 is_pending_(is_pending),
68 upload_size_(0), 71 upload_size_(0),
69 ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { 72 ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
70 DVLOG(1) << "URLRequestAutomationJob create. Count: " << ++instance_count_; 73 DVLOG(1) << "URLRequestAutomationJob create. Count: " << ++instance_count_;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 if (scheme_is_http || scheme_is_https) { 109 if (scheme_is_http || scheme_is_https) {
107 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); 110 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
108 if (info) { 111 if (info) {
109 int child_id = info->GetChildID(); 112 int child_id = info->GetChildID();
110 int route_id = info->GetRouteID(); 113 int route_id = info->GetRouteID();
111 AutomationResourceMessageFilter::AutomationDetails details; 114 AutomationResourceMessageFilter::AutomationDetails details;
112 if (AutomationResourceMessageFilter::LookupRegisteredRenderView( 115 if (AutomationResourceMessageFilter::LookupRegisteredRenderView(
113 child_id, route_id, &details)) { 116 child_id, route_id, &details)) {
114 URLRequestAutomationJob* job = new URLRequestAutomationJob( 117 URLRequestAutomationJob* job = new URLRequestAutomationJob(
115 request, network_delegate, 118 request, network_delegate,
119 request->context()->http_user_agent_settings(),
116 details.tab_handle, info->GetRequestID(), details.filter, 120 details.tab_handle, info->GetRequestID(), details.filter,
117 details.is_pending_render_view); 121 details.is_pending_render_view);
118 return job; 122 return job;
119 } 123 }
120 } 124 }
121 125
122 if (scheme_is_http && old_http_factory_) 126 if (scheme_is_http && old_http_factory_)
123 return old_http_factory_(request, network_delegate, scheme); 127 return old_http_factory_(request, network_delegate, scheme);
124 else if (scheme_is_https && old_https_factory_) 128 else if (scheme_is_https && old_https_factory_)
125 return old_https_factory_(request, network_delegate, scheme); 129 return old_https_factory_(request, network_delegate, scheme);
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 // Strip unwanted headers. 420 // Strip unwanted headers.
417 net::HttpRequestHeaders new_request_headers; 421 net::HttpRequestHeaders new_request_headers;
418 new_request_headers.MergeFrom(request_->extra_request_headers()); 422 new_request_headers.MergeFrom(request_->extra_request_headers());
419 for (size_t i = 0; i < arraysize(kFilteredHeaderStrings); ++i) 423 for (size_t i = 0; i < arraysize(kFilteredHeaderStrings); ++i)
420 new_request_headers.RemoveHeader(kFilteredHeaderStrings[i]); 424 new_request_headers.RemoveHeader(kFilteredHeaderStrings[i]);
421 425
422 // Only add default Accept-Language and Accept-Charset if the request 426 // Only add default Accept-Language and Accept-Charset if the request
423 // didn't have them specified. 427 // didn't have them specified.
424 if (!new_request_headers.HasHeader( 428 if (!new_request_headers.HasHeader(
425 net::HttpRequestHeaders::kAcceptLanguage) && 429 net::HttpRequestHeaders::kAcceptLanguage) &&
426 !request_->context()->accept_language().empty()) { 430 http_user_agent_settings_) {
427 new_request_headers.SetHeader(net::HttpRequestHeaders::kAcceptLanguage, 431 std::string accept_language =
428 request_->context()->accept_language()); 432 http_user_agent_settings_->GetAcceptLanguage();
433 if (!accept_language.empty()) {
434 new_request_headers.SetHeader(net::HttpRequestHeaders::kAcceptLanguage,
435 accept_language);
436 }
429 } 437 }
430 if (!new_request_headers.HasHeader( 438 if (!new_request_headers.HasHeader(
431 net::HttpRequestHeaders::kAcceptCharset) && 439 net::HttpRequestHeaders::kAcceptCharset) &&
432 !request_->context()->accept_charset().empty()) { 440 http_user_agent_settings_) {
433 new_request_headers.SetHeader(net::HttpRequestHeaders::kAcceptCharset, 441 std::string accept_charset = http_user_agent_settings_->GetAcceptCharset();
434 request_->context()->accept_charset()); 442 if (!accept_charset.empty()) {
443 new_request_headers.SetHeader(net::HttpRequestHeaders::kAcceptCharset,
444 accept_charset);
445 }
435 } 446 }
436 447
437 // Ensure that we do not send username and password fields in the referrer. 448 // Ensure that we do not send username and password fields in the referrer.
438 GURL referrer(request_->GetSanitizedReferrer()); 449 GURL referrer(request_->GetSanitizedReferrer());
439 450
440 // The referrer header must be suppressed if the preceding URL was 451 // The referrer header must be suppressed if the preceding URL was
441 // a secure one and the new one is not. 452 // a secure one and the new one is not.
442 if (referrer.SchemeIsSecure() && !request_->url().SchemeIsSecure()) { 453 if (referrer.SchemeIsSecure() && !request_->url().SchemeIsSecure()) {
443 DVLOG(1) << "Suppressing referrer header since going from secure to " 454 DVLOG(1) << "Suppressing referrer header since going from secure to "
444 "non-secure"; 455 "non-secure";
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 if (!is_done()) { 499 if (!is_done()) {
489 NotifyDone(request_status_); 500 NotifyDone(request_status_);
490 } 501 }
491 // Reset any pending reads. 502 // Reset any pending reads.
492 if (pending_buf_) { 503 if (pending_buf_) {
493 pending_buf_ = NULL; 504 pending_buf_ = NULL;
494 pending_buf_size_ = 0; 505 pending_buf_size_ = 0;
495 NotifyReadComplete(0); 506 NotifyReadComplete(0);
496 } 507 }
497 } 508 }
OLDNEW
« no previous file with comments | « chrome/browser/automation/url_request_automation_job.h ('k') | chrome/browser/io_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698