| OLD | NEW |
| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "net/base/network_delegate.h" | 10 #include "net/base/network_delegate.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 context_->set_network_delegate(network_delegate.get()); | 80 context_->set_network_delegate(network_delegate.get()); |
| 81 network_delegate_ = std::move(network_delegate); | 81 network_delegate_ = std::move(network_delegate); |
| 82 } | 82 } |
| 83 | 83 |
| 84 void URLRequestContextStorage::set_http_server_properties( | 84 void URLRequestContextStorage::set_http_server_properties( |
| 85 scoped_ptr<HttpServerProperties> http_server_properties) { | 85 scoped_ptr<HttpServerProperties> http_server_properties) { |
| 86 http_server_properties_ = std::move(http_server_properties); | 86 http_server_properties_ = std::move(http_server_properties); |
| 87 context_->set_http_server_properties(http_server_properties_->GetWeakPtr()); | 87 context_->set_http_server_properties(http_server_properties_->GetWeakPtr()); |
| 88 } | 88 } |
| 89 | 89 |
| 90 void URLRequestContextStorage::set_cookie_store(CookieStore* cookie_store) { | 90 void URLRequestContextStorage::set_cookie_store( |
| 91 context_->set_cookie_store(cookie_store); | 91 scoped_ptr<CookieStore> cookie_store) { |
| 92 cookie_store_ = cookie_store; | 92 context_->set_cookie_store(cookie_store.get()); |
| 93 cookie_store_ = std::move(cookie_store); |
| 93 } | 94 } |
| 94 | 95 |
| 95 void URLRequestContextStorage::set_transport_security_state( | 96 void URLRequestContextStorage::set_transport_security_state( |
| 96 scoped_ptr<TransportSecurityState> transport_security_state) { | 97 scoped_ptr<TransportSecurityState> transport_security_state) { |
| 97 context_->set_transport_security_state(transport_security_state.get()); | 98 context_->set_transport_security_state(transport_security_state.get()); |
| 98 transport_security_state_ = std::move(transport_security_state); | 99 transport_security_state_ = std::move(transport_security_state); |
| 99 } | 100 } |
| 100 | 101 |
| 101 void URLRequestContextStorage::set_http_network_session( | 102 void URLRequestContextStorage::set_http_network_session( |
| 102 scoped_ptr<HttpNetworkSession> http_network_session) { | 103 scoped_ptr<HttpNetworkSession> http_network_session) { |
| (...skipping 30 matching lines...) Expand all Loading... |
| 133 http_user_agent_settings_ = std::move(http_user_agent_settings); | 134 http_user_agent_settings_ = std::move(http_user_agent_settings); |
| 134 } | 135 } |
| 135 | 136 |
| 136 void URLRequestContextStorage::set_sdch_manager( | 137 void URLRequestContextStorage::set_sdch_manager( |
| 137 scoped_ptr<SdchManager> sdch_manager) { | 138 scoped_ptr<SdchManager> sdch_manager) { |
| 138 context_->set_sdch_manager(sdch_manager.get()); | 139 context_->set_sdch_manager(sdch_manager.get()); |
| 139 sdch_manager_ = std::move(sdch_manager); | 140 sdch_manager_ = std::move(sdch_manager); |
| 140 } | 141 } |
| 141 | 142 |
| 142 } // namespace net | 143 } // namespace net |
| OLD | NEW |