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

Side by Side Diff: net/url_request/url_fetcher_core.cc

Issue 1304143010: Plumbing SSLPrivateKey Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 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
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 "net/url_request/url_fetcher_core.h" 5 #include "net/url_request/url_fetcher_core.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/metrics/histogram_macros.h" 11 #include "base/metrics/histogram_macros.h"
12 #include "base/profiler/scoped_tracker.h" 12 #include "base/profiler/scoped_tracker.h"
13 #include "base/sequenced_task_runner.h" 13 #include "base/sequenced_task_runner.h"
14 #include "base/single_thread_task_runner.h" 14 #include "base/single_thread_task_runner.h"
15 #include "base/stl_util.h" 15 #include "base/stl_util.h"
16 #include "base/thread_task_runner_handle.h" 16 #include "base/thread_task_runner_handle.h"
17 #include "base/tracked_objects.h" 17 #include "base/tracked_objects.h"
18 #include "net/base/elements_upload_data_stream.h" 18 #include "net/base/elements_upload_data_stream.h"
19 #include "net/base/io_buffer.h" 19 #include "net/base/io_buffer.h"
20 #include "net/base/load_flags.h" 20 #include "net/base/load_flags.h"
21 #include "net/base/net_errors.h" 21 #include "net/base/net_errors.h"
22 #include "net/base/request_priority.h" 22 #include "net/base/request_priority.h"
23 #include "net/base/upload_bytes_element_reader.h" 23 #include "net/base/upload_bytes_element_reader.h"
24 #include "net/base/upload_data_stream.h" 24 #include "net/base/upload_data_stream.h"
25 #include "net/base/upload_file_element_reader.h" 25 #include "net/base/upload_file_element_reader.h"
26 #include "net/http/http_response_headers.h" 26 #include "net/http/http_response_headers.h"
27 #include "net/ssl/ssl_private_key.h"
davidben 2015/09/25 20:10:12 I don't think this include is actually needed, is
svaldez 2015/09/28 16:54:53 Done.
27 #include "net/url_request/redirect_info.h" 28 #include "net/url_request/redirect_info.h"
28 #include "net/url_request/url_fetcher_delegate.h" 29 #include "net/url_request/url_fetcher_delegate.h"
29 #include "net/url_request/url_fetcher_response_writer.h" 30 #include "net/url_request/url_fetcher_response_writer.h"
30 #include "net/url_request/url_request_context.h" 31 #include "net/url_request/url_request_context.h"
31 #include "net/url_request/url_request_context_getter.h" 32 #include "net/url_request/url_request_context_getter.h"
32 #include "net/url_request/url_request_throttler_manager.h" 33 #include "net/url_request/url_request_throttler_manager.h"
33 34
34 namespace { 35 namespace {
35 36
36 const int kBufferSize = 4096; 37 const int kBufferSize = 4096;
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 ReadResponse(); 431 ReadResponse();
431 } 432 }
432 433
433 void URLFetcherCore::OnCertificateRequested( 434 void URLFetcherCore::OnCertificateRequested(
434 URLRequest* request, 435 URLRequest* request,
435 SSLCertRequestInfo* cert_request_info) { 436 SSLCertRequestInfo* cert_request_info) {
436 DCHECK_EQ(request, request_.get()); 437 DCHECK_EQ(request, request_.get());
437 DCHECK(network_task_runner_->BelongsToCurrentThread()); 438 DCHECK(network_task_runner_->BelongsToCurrentThread());
438 439
439 if (g_ignore_certificate_requests) { 440 if (g_ignore_certificate_requests) {
440 request->ContinueWithCertificate(NULL); 441 request->ContinueWithCertificate(NULL, NULL);
davidben 2015/09/25 20:10:12 Nit: While you're here, want to switch these both
svaldez 2015/09/28 16:54:53 Done.
441 } else { 442 } else {
442 request->Cancel(); 443 request->Cancel();
443 } 444 }
444 } 445 }
445 446
446 void URLFetcherCore::OnReadCompleted(URLRequest* request, 447 void URLFetcherCore::OnReadCompleted(URLRequest* request,
447 int bytes_read) { 448 int bytes_read) {
448 DCHECK(request == request_); 449 DCHECK(request == request_);
449 DCHECK(network_task_runner_->BelongsToCurrentThread()); 450 DCHECK(network_task_runner_->BelongsToCurrentThread());
450 451
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 } 951 }
951 952
952 void URLFetcherCore::AssertHasNoUploadData() const { 953 void URLFetcherCore::AssertHasNoUploadData() const {
953 DCHECK(!upload_content_set_); 954 DCHECK(!upload_content_set_);
954 DCHECK(upload_content_.empty()); 955 DCHECK(upload_content_.empty());
955 DCHECK(upload_file_path_.empty()); 956 DCHECK(upload_file_path_.empty());
956 DCHECK(upload_stream_factory_.is_null()); 957 DCHECK(upload_stream_factory_.is_null());
957 } 958 }
958 959
959 } // namespace net 960 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698