diff options
Diffstat (limited to 'net/url_request/url_request_context_storage.cc')
-rw-r--r-- | net/url_request/url_request_context_storage.cc | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/net/url_request/url_request_context_storage.cc b/net/url_request/url_request_context_storage.cc index e4294b2..399bc47 100644 --- a/net/url_request/url_request_context_storage.cc +++ b/net/url_request/url_request_context_storage.cc @@ -4,6 +4,8 @@ #include "net/url_request/url_request_context_storage.h" +#include <utility> + #include "base/logging.h" #include "net/base/network_delegate.h" #include "net/base/sdch_manager.h" @@ -34,37 +36,37 @@ URLRequestContextStorage::~URLRequestContextStorage() {} void URLRequestContextStorage::set_net_log(scoped_ptr<NetLog> net_log) { context_->set_net_log(net_log.get()); - net_log_ = net_log.Pass(); + net_log_ = std::move(net_log); } void URLRequestContextStorage::set_host_resolver( scoped_ptr<HostResolver> host_resolver) { context_->set_host_resolver(host_resolver.get()); - host_resolver_ = host_resolver.Pass(); + host_resolver_ = std::move(host_resolver); } void URLRequestContextStorage::set_cert_verifier( scoped_ptr<CertVerifier> cert_verifier) { context_->set_cert_verifier(cert_verifier.get()); - cert_verifier_ = cert_verifier.Pass(); + cert_verifier_ = std::move(cert_verifier); } void URLRequestContextStorage::set_channel_id_service( scoped_ptr<ChannelIDService> channel_id_service) { context_->set_channel_id_service(channel_id_service.get()); - channel_id_service_ = channel_id_service.Pass(); + channel_id_service_ = std::move(channel_id_service); } void URLRequestContextStorage::set_http_auth_handler_factory( scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory) { context_->set_http_auth_handler_factory(http_auth_handler_factory.get()); - http_auth_handler_factory_ = http_auth_handler_factory.Pass(); + http_auth_handler_factory_ = std::move(http_auth_handler_factory); } void URLRequestContextStorage::set_proxy_service( scoped_ptr<ProxyService> proxy_service) { context_->set_proxy_service(proxy_service.get()); - proxy_service_ = proxy_service.Pass(); + proxy_service_ = std::move(proxy_service); } void URLRequestContextStorage::set_ssl_config_service( @@ -76,12 +78,12 @@ void URLRequestContextStorage::set_ssl_config_service( void URLRequestContextStorage::set_network_delegate( scoped_ptr<NetworkDelegate> network_delegate) { context_->set_network_delegate(network_delegate.get()); - network_delegate_ = network_delegate.Pass(); + network_delegate_ = std::move(network_delegate); } void URLRequestContextStorage::set_http_server_properties( scoped_ptr<HttpServerProperties> http_server_properties) { - http_server_properties_ = http_server_properties.Pass(); + http_server_properties_ = std::move(http_server_properties); context_->set_http_server_properties(http_server_properties_->GetWeakPtr()); } @@ -93,48 +95,48 @@ void URLRequestContextStorage::set_cookie_store(CookieStore* cookie_store) { void URLRequestContextStorage::set_transport_security_state( scoped_ptr<TransportSecurityState> transport_security_state) { context_->set_transport_security_state(transport_security_state.get()); - transport_security_state_ = transport_security_state.Pass(); + transport_security_state_ = std::move(transport_security_state); } void URLRequestContextStorage::set_http_network_session( scoped_ptr<HttpNetworkSession> http_network_session) { - http_network_session_ = http_network_session.Pass(); + http_network_session_ = std::move(http_network_session); } void URLRequestContextStorage::set_http_transaction_factory( scoped_ptr<HttpTransactionFactory> http_transaction_factory) { context_->set_http_transaction_factory(http_transaction_factory.get()); - http_transaction_factory_ = http_transaction_factory.Pass(); + http_transaction_factory_ = std::move(http_transaction_factory); } void URLRequestContextStorage::set_job_factory( scoped_ptr<URLRequestJobFactory> job_factory) { context_->set_job_factory(job_factory.get()); - job_factory_ = job_factory.Pass(); + job_factory_ = std::move(job_factory); } void URLRequestContextStorage::set_throttler_manager( scoped_ptr<URLRequestThrottlerManager> throttler_manager) { context_->set_throttler_manager(throttler_manager.get()); - throttler_manager_ = throttler_manager.Pass(); + throttler_manager_ = std::move(throttler_manager); } void URLRequestContextStorage::set_backoff_manager( scoped_ptr<URLRequestBackoffManager> backoff_manager) { context_->set_backoff_manager(backoff_manager.get()); - backoff_manager_ = backoff_manager.Pass(); + backoff_manager_ = std::move(backoff_manager); } void URLRequestContextStorage::set_http_user_agent_settings( scoped_ptr<HttpUserAgentSettings> http_user_agent_settings) { context_->set_http_user_agent_settings(http_user_agent_settings.get()); - http_user_agent_settings_ = http_user_agent_settings.Pass(); + http_user_agent_settings_ = std::move(http_user_agent_settings); } void URLRequestContextStorage::set_sdch_manager( scoped_ptr<SdchManager> sdch_manager) { context_->set_sdch_manager(sdch_manager.get()); - sdch_manager_ = sdch_manager.Pass(); + sdch_manager_ = std::move(sdch_manager); } } // namespace net |