diff options
Diffstat (limited to 'chromium/net/spdy/spdy_session_pool.cc')
| -rw-r--r-- | chromium/net/spdy/spdy_session_pool.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chromium/net/spdy/spdy_session_pool.cc b/chromium/net/spdy/spdy_session_pool.cc index eef0f9bfc48..120887859ea 100644 --- a/chromium/net/spdy/spdy_session_pool.cc +++ b/chromium/net/spdy/spdy_session_pool.cc @@ -4,6 +4,8 @@ #include "net/spdy/spdy_session_pool.h" +#include <utility> + #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/profiler/scoped_tracker.h" @@ -13,7 +15,6 @@ #include "net/http/http_server_properties.h" #include "net/spdy/spdy_session.h" - namespace net { namespace { @@ -102,8 +103,8 @@ base::WeakPtr<SpdySession> SpdySessionPool::CreateAvailableSessionFromSocket( stream_max_recv_window_size_, initial_max_concurrent_streams_, time_func_, trusted_spdy_proxy_, net_log.net_log())); - new_session->InitializeWithSocket( - connection.Pass(), this, is_secure, certificate_error_code); + new_session->InitializeWithSocket(std::move(connection), this, is_secure, + certificate_error_code); base::WeakPtr<SpdySession> available_session = new_session->GetWeakPtr(); sessions_.insert(new_session.release()); @@ -260,7 +261,7 @@ scoped_ptr<base::Value> SpdySessionPool::SpdySessionPoolInfoToValue() const { if (key.Equals(session_key)) list->Append(it->second->GetInfoAsValue()); } - return list.Pass(); + return std::move(list); } void SpdySessionPool::OnIPAddressChanged() { |