Change scoped_ptr to std::unique_ptr in //net/socket.

net/socket/websocket_transport_connect_sub_job.h

 // Copyright 2014 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.
 
 #ifndef NET_SOCKET_WEBSOCKET_TRANSPORT_CONNECT_SUB_JOB_H_
 #define NET_SOCKET_WEBSOCKET_TRANSPORT_CONNECT_SUB_JOB_H_
 
 #include <stddef.h>
+
+#include <memory>
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "net/base/address_list.h"
 #include "net/base/load_states.h"
 #include "net/socket/websocket_endpoint_lock_manager.h"
 #include "net/socket/websocket_transport_client_socket_pool.h"
 
 namespace net {
 
 class BoundNetLog;
 class ClientSocketFactory;
 class IPEndPoint;
@@ skipping 16 matching lines @@
 
   // Start connecting.
   int Start();
 
   bool started() { return next_state_ != STATE_NONE; }
 
   LoadState GetLoadState() const;
 
   SubJobType type() const { return type_; }
 
-  scoped_ptr<StreamSocket> PassSocket() { return std::move(transport_socket_); }
+  std::unique_ptr<StreamSocket> PassSocket() {
+    return std::move(transport_socket_);
+  }
 
   // Implementation of WebSocketEndpointLockManager::EndpointWaiter.
   void GotEndpointLock() override;
 
  private:
   enum State {
     STATE_NONE,
     STATE_OBTAIN_LOCK,
     STATE_OBTAIN_LOCK_COMPLETE,
     STATE_TRANSPORT_CONNECT,
@@ skipping 15 matching lines @@
   int DoTransportConnectComplete(int result);
 
   WebSocketTransportConnectJob* const parent_job_;
 
   const AddressList addresses_;
   size_t current_address_index_;
 
   State next_state_;
   const SubJobType type_;
 
-  scoped_ptr<StreamSocket> transport_socket_;
+  std::unique_ptr<StreamSocket> transport_socket_;
 
   DISALLOW_COPY_AND_ASSIGN(WebSocketTransportConnectSubJob);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_WEBSOCKET_TRANSPORT_CONNECT_SUB_JOB_H_