Convert Pass()→std::move() in //net

net/socket/client_socket_handle.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/client_socket_handle.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "net/base/net_errors.h"
 #include "net/socket/client_socket_pool.h"
 
 namespace net {
 
 ClientSocketHandle::ClientSocketHandle()
@@ skipping 19 matching lines @@
 void ClientSocketHandle::ResetInternal(bool cancel) {
   // Was Init called?
   if (!group_name_.empty()) {
     // If so, we must have a pool.
     CHECK(pool_);
     if (is_initialized()) {
       if (socket_) {
         socket_->NetLog().EndEvent(NetLog::TYPE_SOCKET_IN_USE);
         // Release the socket back to the ClientSocketPool so it can be
         // deleted or reused.
-        pool_->ReleaseSocket(group_name_, socket_.Pass(), pool_id_);
+        pool_->ReleaseSocket(group_name_, std::move(socket_), pool_id_);
       } else {
         // If the handle has been initialized, we should still have a
         // socket.
         NOTREACHED();
       }
     } else if (cancel) {
       // If we did not get initialized yet and we have a socket
       // request pending, cancel it.
       pool_->CancelRequest(group_name_, this);
     }
@@ skipping 70 matching lines @@
 
   // No times if the socket is reused.
   if (is_reused)
     return true;
 
   load_timing_info->connect_timing = connect_timing_;
   return true;
 }
 
 void ClientSocketHandle::SetSocket(scoped_ptr<StreamSocket> s) {
-  socket_ = s.Pass();
+  socket_ = std::move(s);
 }
 
 void ClientSocketHandle::OnIOComplete(int result) {
   CompletionCallback callback = user_callback_;
   user_callback_.Reset();
   HandleInitCompletion(result);
   callback.Run(result);
 }
 
 scoped_ptr<StreamSocket> ClientSocketHandle::PassSocket() {
-  return socket_.Pass();
+  return std::move(socket_);
 }
 
 void ClientSocketHandle::HandleInitCompletion(int result) {
   CHECK_NE(ERR_IO_PENDING, result);
   if (result != OK) {
     if (!socket_.get())
       ResetInternal(false);  // Nothing to cancel since the request failed.
     else
       is_initialized_ = true;
     return;
   }
   is_initialized_ = true;
   CHECK_NE(-1, pool_id_) << "Pool should have set |pool_id_| to a valid value.";
   setup_time_ = base::TimeTicks::Now() - init_time_;
 
   // Broadcast that the socket has been acquired.
   // TODO(eroman): This logging is not complete, in particular set_socket() and
   // release() socket. It ends up working though, since those methods are being
   // used to layer sockets (and the destination sources are the same).
   DCHECK(socket_.get());
   socket_->NetLog().BeginEvent(
       NetLog::TYPE_SOCKET_IN_USE,
       requesting_source_.ToEventParametersCallback());
 }
 
 }  // namespace net