summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 17:19:59 +0000
committermkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 17:19:59 +0000
commitfa22a6f148f68c8d80f0ed04e477c7c34f1da33c (patch)
treef562ae9ca1af6283eb627e9daaf51b8c8a719628 /net
parentcda584acdcb9dcd8a5e467da7b9af5280b1fdc5c (diff)
downloadchromium_src-fa22a6f148f68c8d80f0ed04e477c7c34f1da33c.zip
chromium_src-fa22a6f148f68c8d80f0ed04e477c7c34f1da33c.tar.gz
chromium_src-fa22a6f148f68c8d80f0ed04e477c7c34f1da33c.tar.bz2
Make URLRequestContext::CopyFrom take a const pointer.
BUG=none TEST=builds Review URL: https://chromiumcodereview.appspot.com/10365011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/url_request/url_request_context.cc40
-rw-r--r--net/url_request/url_request_context.h2
2 files changed, 21 insertions, 21 deletions
diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
index aac6f2e..105fcdc 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -38,28 +38,28 @@ URLRequestContext::~URLRequestContext() {
AssertNoURLRequests();
}
-void URLRequestContext::CopyFrom(URLRequestContext* other) {
+void URLRequestContext::CopyFrom(const URLRequestContext* other) {
// Copy URLRequestContext parameters.
- set_net_log(other->net_log());
- set_host_resolver(other->host_resolver());
- set_cert_verifier(other->cert_verifier());
- set_server_bound_cert_service(other->server_bound_cert_service());
- set_fraudulent_certificate_reporter(other->fraudulent_certificate_reporter());
- set_http_auth_handler_factory(other->http_auth_handler_factory());
- set_proxy_service(other->proxy_service());
- set_ssl_config_service(other->ssl_config_service());
- set_network_delegate(other->network_delegate());
- set_http_server_properties(other->http_server_properties());
- set_cookie_store(other->cookie_store());
- set_transport_security_state(other->transport_security_state());
+ set_net_log(other->net_log_);
+ set_host_resolver(other->host_resolver_);
+ set_cert_verifier(other->cert_verifier_);
+ set_server_bound_cert_service(other->server_bound_cert_service_);
+ set_fraudulent_certificate_reporter(other->fraudulent_certificate_reporter_);
+ set_http_auth_handler_factory(other->http_auth_handler_factory_);
+ set_proxy_service(other->proxy_service_);
+ set_ssl_config_service(other->ssl_config_service_);
+ set_network_delegate(other->network_delegate_);
+ set_http_server_properties(other->http_server_properties_);
+ set_cookie_store(other->cookie_store_);
+ set_transport_security_state(other->transport_security_state_);
// FTPAuthCache is unique per context.
- set_accept_language(other->accept_language());
- set_accept_charset(other->accept_charset());
- set_referrer_charset(other->referrer_charset());
- set_http_transaction_factory(other->http_transaction_factory());
- set_ftp_transaction_factory(other->ftp_transaction_factory());
- set_job_factory(other->job_factory());
- set_throttler_manager(other->throttler_manager());
+ set_accept_language(other->accept_language_);
+ set_accept_charset(other->accept_charset_);
+ set_referrer_charset(other->referrer_charset_);
+ set_http_transaction_factory(other->http_transaction_factory_);
+ set_ftp_transaction_factory(other->ftp_transaction_factory_);
+ set_job_factory(other->job_factory_);
+ set_throttler_manager(other->throttler_manager_);
}
void URLRequestContext::set_cookie_store(CookieStore* cookie_store) {
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 26261f2..74c52a3 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -50,7 +50,7 @@ class NET_EXPORT URLRequestContext
virtual ~URLRequestContext();
// Copies the state from |other| into this context.
- void CopyFrom(URLRequestContext* other);
+ void CopyFrom(const URLRequestContext* other);
NetLog* net_log() const {
return net_log_;