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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 scoped_ptr<ProxyDelegate> proxy_delegate) { | 86 scoped_ptr<ProxyDelegate> proxy_delegate) { |
87 proxy_delegate_ = std::move(proxy_delegate); | 87 proxy_delegate_ = std::move(proxy_delegate); |
88 } | 88 } |
89 | 89 |
90 void URLRequestContextStorage::set_http_server_properties( | 90 void URLRequestContextStorage::set_http_server_properties( |
91 scoped_ptr<HttpServerProperties> http_server_properties) { | 91 scoped_ptr<HttpServerProperties> http_server_properties) { |
92 http_server_properties_ = std::move(http_server_properties); | 92 http_server_properties_ = std::move(http_server_properties); |
93 context_->set_http_server_properties(http_server_properties_->GetWeakPtr()); | 93 context_->set_http_server_properties(http_server_properties_->GetWeakPtr()); |
94 } | 94 } |
95 | 95 |
96 void URLRequestContextStorage::set_cookie_store(CookieStore* cookie_store) { | 96 void URLRequestContextStorage::set_cookie_store( |
97 context_->set_cookie_store(cookie_store); | 97 scoped_ptr<CookieStore> cookie_store) { |
98 cookie_store_ = cookie_store; | 98 context_->set_cookie_store(cookie_store.get()); |
| 99 cookie_store_ = std::move(cookie_store); |
99 } | 100 } |
100 | 101 |
101 void URLRequestContextStorage::set_transport_security_state( | 102 void URLRequestContextStorage::set_transport_security_state( |
102 scoped_ptr<TransportSecurityState> transport_security_state) { | 103 scoped_ptr<TransportSecurityState> transport_security_state) { |
103 context_->set_transport_security_state(transport_security_state.get()); | 104 context_->set_transport_security_state(transport_security_state.get()); |
104 transport_security_state_ = std::move(transport_security_state); | 105 transport_security_state_ = std::move(transport_security_state); |
105 } | 106 } |
106 | 107 |
107 void URLRequestContextStorage::set_http_network_session( | 108 void URLRequestContextStorage::set_http_network_session( |
108 scoped_ptr<HttpNetworkSession> http_network_session) { | 109 scoped_ptr<HttpNetworkSession> http_network_session) { |
(...skipping 30 matching lines...) Expand all Loading... |
139 http_user_agent_settings_ = std::move(http_user_agent_settings); | 140 http_user_agent_settings_ = std::move(http_user_agent_settings); |
140 } | 141 } |
141 | 142 |
142 void URLRequestContextStorage::set_sdch_manager( | 143 void URLRequestContextStorage::set_sdch_manager( |
143 scoped_ptr<SdchManager> sdch_manager) { | 144 scoped_ptr<SdchManager> sdch_manager) { |
144 context_->set_sdch_manager(sdch_manager.get()); | 145 context_->set_sdch_manager(sdch_manager.get()); |
145 sdch_manager_ = std::move(sdch_manager); | 146 sdch_manager_ = std::move(sdch_manager); |
146 } | 147 } |
147 | 148 |
148 } // namespace net | 149 } // namespace net |
OLD | NEW |