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

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

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix cookies_list.js Created 6 years, 5 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
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_request_context_storage.h" 5 #include "net/url_request/url_request_context_storage.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "net/base/net_log.h" 8 #include "net/base/net_log.h"
9 #include "net/base/network_delegate.h" 9 #include "net/base/network_delegate.h"
10 #include "net/cert/cert_verifier.h" 10 #include "net/cert/cert_verifier.h"
11 #include "net/cookies/cookie_store.h" 11 #include "net/cookies/cookie_store.h"
12 #include "net/dns/host_resolver.h" 12 #include "net/dns/host_resolver.h"
13 #include "net/ftp/ftp_transaction_factory.h" 13 #include "net/ftp/ftp_transaction_factory.h"
14 #include "net/http/http_auth_handler_factory.h" 14 #include "net/http/http_auth_handler_factory.h"
15 #include "net/http/http_server_properties.h" 15 #include "net/http/http_server_properties.h"
16 #include "net/http/http_transaction_factory.h" 16 #include "net/http/http_transaction_factory.h"
17 #include "net/proxy/proxy_service.h" 17 #include "net/proxy/proxy_service.h"
18 #include "net/ssl/server_bound_cert_service.h" 18 #include "net/ssl/channel_id_service.h"
19 #include "net/url_request/fraudulent_certificate_reporter.h" 19 #include "net/url_request/fraudulent_certificate_reporter.h"
20 #include "net/url_request/http_user_agent_settings.h" 20 #include "net/url_request/http_user_agent_settings.h"
21 #include "net/url_request/url_request_context.h" 21 #include "net/url_request/url_request_context.h"
22 #include "net/url_request/url_request_job_factory.h" 22 #include "net/url_request/url_request_job_factory.h"
23 #include "net/url_request/url_request_throttler_manager.h" 23 #include "net/url_request/url_request_throttler_manager.h"
24 24
25 namespace net { 25 namespace net {
26 26
27 URLRequestContextStorage::URLRequestContextStorage(URLRequestContext* context) 27 URLRequestContextStorage::URLRequestContextStorage(URLRequestContext* context)
28 : context_(context) { 28 : context_(context) {
(...skipping 11 matching lines...) Expand all
40 scoped_ptr<HostResolver> host_resolver) { 40 scoped_ptr<HostResolver> host_resolver) {
41 context_->set_host_resolver(host_resolver.get()); 41 context_->set_host_resolver(host_resolver.get());
42 host_resolver_ = host_resolver.Pass(); 42 host_resolver_ = host_resolver.Pass();
43 } 43 }
44 44
45 void URLRequestContextStorage::set_cert_verifier(CertVerifier* cert_verifier) { 45 void URLRequestContextStorage::set_cert_verifier(CertVerifier* cert_verifier) {
46 context_->set_cert_verifier(cert_verifier); 46 context_->set_cert_verifier(cert_verifier);
47 cert_verifier_.reset(cert_verifier); 47 cert_verifier_.reset(cert_verifier);
48 } 48 }
49 49
50 void URLRequestContextStorage::set_server_bound_cert_service( 50 void URLRequestContextStorage::set_channel_id_service(
51 ServerBoundCertService* server_bound_cert_service) { 51 ChannelIDService* channel_id_service) {
52 context_->set_server_bound_cert_service(server_bound_cert_service); 52 context_->set_channel_id_service(channel_id_service);
53 server_bound_cert_service_.reset(server_bound_cert_service); 53 channel_id_service_.reset(channel_id_service);
54 } 54 }
55 55
56 void URLRequestContextStorage::set_fraudulent_certificate_reporter( 56 void URLRequestContextStorage::set_fraudulent_certificate_reporter(
57 FraudulentCertificateReporter* fraudulent_certificate_reporter) { 57 FraudulentCertificateReporter* fraudulent_certificate_reporter) {
58 context_->set_fraudulent_certificate_reporter( 58 context_->set_fraudulent_certificate_reporter(
59 fraudulent_certificate_reporter); 59 fraudulent_certificate_reporter);
60 fraudulent_certificate_reporter_.reset(fraudulent_certificate_reporter); 60 fraudulent_certificate_reporter_.reset(fraudulent_certificate_reporter);
61 } 61 }
62 62
63 void URLRequestContextStorage::set_http_auth_handler_factory( 63 void URLRequestContextStorage::set_http_auth_handler_factory(
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 throttler_manager_.reset(throttler_manager); 118 throttler_manager_.reset(throttler_manager);
119 } 119 }
120 120
121 void URLRequestContextStorage::set_http_user_agent_settings( 121 void URLRequestContextStorage::set_http_user_agent_settings(
122 HttpUserAgentSettings* http_user_agent_settings) { 122 HttpUserAgentSettings* http_user_agent_settings) {
123 context_->set_http_user_agent_settings(http_user_agent_settings); 123 context_->set_http_user_agent_settings(http_user_agent_settings);
124 http_user_agent_settings_.reset(http_user_agent_settings); 124 http_user_agent_settings_.reset(http_user_agent_settings);
125 } 125 }
126 126
127 } // namespace net 127 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698