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

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: Change to returning strings by value Created 8 years, 2 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 | « no previous file | chrome/browser/io_thread.h » ('j') | chrome/browser/io_thread.h » ('J')
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"
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 // Register this request with automation message filter. 413 // Register this request with automation message filter.
414 message_filter_->RegisterRequest(this); 414 message_filter_->RegisterRequest(this);
415 415
416 // Strip unwanted headers. 416 // Strip unwanted headers.
417 net::HttpRequestHeaders new_request_headers; 417 net::HttpRequestHeaders new_request_headers;
418 new_request_headers.MergeFrom(request_->extra_request_headers()); 418 new_request_headers.MergeFrom(request_->extra_request_headers());
419 for (size_t i = 0; i < arraysize(kFilteredHeaderStrings); ++i) 419 for (size_t i = 0; i < arraysize(kFilteredHeaderStrings); ++i)
420 new_request_headers.RemoveHeader(kFilteredHeaderStrings[i]); 420 new_request_headers.RemoveHeader(kFilteredHeaderStrings[i]);
421 421
422 // Only add default Accept-Language and Accept-Charset if the request 422 // Only add default Accept-Language and Accept-Charset if the request
423 // didn't have them specified. 423 // didn't have them specified.
willchan no longer on Chromium 2012/10/06 19:32:49 Is this code simply redundant? Doesn't URLRequestH
mmenke 2012/10/08 15:06:31 That's done in URLRequestJob::Start (Which calls U
424 if (!new_request_headers.HasHeader( 424 if (!new_request_headers.HasHeader(
425 net::HttpRequestHeaders::kAcceptLanguage) && 425 net::HttpRequestHeaders::kAcceptLanguage) &&
426 !request_->context()->accept_language().empty()) { 426 !request_->context()->GetAcceptLanguage().empty()) {
mmenke 2012/10/05 20:08:51 Suggest you avoid the double virtual call / string
427 new_request_headers.SetHeader(net::HttpRequestHeaders::kAcceptLanguage, 427 new_request_headers.SetHeader(net::HttpRequestHeaders::kAcceptLanguage,
428 request_->context()->accept_language()); 428 request_->context()->GetAcceptLanguage());
429 } 429 }
430 if (!new_request_headers.HasHeader( 430 if (!new_request_headers.HasHeader(
431 net::HttpRequestHeaders::kAcceptCharset) && 431 net::HttpRequestHeaders::kAcceptCharset) &&
432 !request_->context()->accept_charset().empty()) { 432 !request_->context()->GetAcceptCharset().empty()) {
433 new_request_headers.SetHeader(net::HttpRequestHeaders::kAcceptCharset, 433 new_request_headers.SetHeader(net::HttpRequestHeaders::kAcceptCharset,
434 request_->context()->accept_charset()); 434 request_->context()->GetAcceptCharset());
435 } 435 }
436 436
437 // Ensure that we do not send username and password fields in the referrer. 437 // Ensure that we do not send username and password fields in the referrer.
438 GURL referrer(request_->GetSanitizedReferrer()); 438 GURL referrer(request_->GetSanitizedReferrer());
439 439
440 // The referrer header must be suppressed if the preceding URL was 440 // The referrer header must be suppressed if the preceding URL was
441 // a secure one and the new one is not. 441 // a secure one and the new one is not.
442 if (referrer.SchemeIsSecure() && !request_->url().SchemeIsSecure()) { 442 if (referrer.SchemeIsSecure() && !request_->url().SchemeIsSecure()) {
443 DVLOG(1) << "Suppressing referrer header since going from secure to " 443 DVLOG(1) << "Suppressing referrer header since going from secure to "
444 "non-secure"; 444 "non-secure";
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 if (!is_done()) { 488 if (!is_done()) {
489 NotifyDone(request_status_); 489 NotifyDone(request_status_);
490 } 490 }
491 // Reset any pending reads. 491 // Reset any pending reads.
492 if (pending_buf_) { 492 if (pending_buf_) {
493 pending_buf_ = NULL; 493 pending_buf_ = NULL;
494 pending_buf_size_ = 0; 494 pending_buf_size_ = 0;
495 NotifyReadComplete(0); 495 NotifyReadComplete(0);
496 } 496 }
497 } 497 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.h » ('j') | chrome/browser/io_thread.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698