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

net/socket/socks_client_socket_pool.h

 // 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.
 
 #ifndef NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_
 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_
 
+#include <memory>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "net/base/host_port_pair.h"
 #include "net/dns/host_resolver.h"
 #include "net/socket/client_socket_pool.h"
 #include "net/socket/client_socket_pool_base.h"
 
 namespace net {
 
 class ConnectJobFactory;
 class SocketPerformanceWatcherFactory;
@@ skipping 66 matching lines @@
   // success and ERR_IO_PENDING if it cannot immediately service the request.
   // Otherwise, it returns a net error code.
   int ConnectInternal() override;
 
   scoped_refptr<SOCKSSocketParams> socks_params_;
   TransportClientSocketPool* const transport_pool_;
   HostResolver* const resolver_;
 
   State next_state_;
   CompletionCallback callback_;
-  scoped_ptr<ClientSocketHandle> transport_socket_handle_;
-  scoped_ptr<StreamSocket> socket_;
+  std::unique_ptr<ClientSocketHandle> transport_socket_handle_;
+  std::unique_ptr<StreamSocket> socket_;
 
   DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJob);
 };
 
 class NET_EXPORT_PRIVATE SOCKSClientSocketPool
     : public ClientSocketPool, public HigherLayeredPool {
  public:
   typedef SOCKSSocketParams SocketParams;
 
   SOCKSClientSocketPool(int max_sockets,
@@ skipping 16 matching lines @@
 
   void RequestSockets(const std::string& group_name,
                       const void* params,
                       int num_sockets,
                       const BoundNetLog& net_log) override;
 
   void CancelRequest(const std::string& group_name,
                      ClientSocketHandle* handle) override;
 
   void ReleaseSocket(const std::string& group_name,
-                     scoped_ptr<StreamSocket> socket,
+                     std::unique_ptr<StreamSocket> socket,
                      int id) override;
 
   void FlushWithError(int error) override;
 
   void CloseIdleSockets() override;
 
   int IdleSocketCount() const override;
 
   int IdleSocketCountInGroup(const std::string& group_name) const override;
 
   LoadState GetLoadState(const std::string& group_name,
                          const ClientSocketHandle* handle) const override;
 
-  scoped_ptr<base::DictionaryValue> GetInfoAsValue(
+  std::unique_ptr<base::DictionaryValue> GetInfoAsValue(
       const std::string& name,
       const std::string& type,
       bool include_nested_pools) const override;
 
   base::TimeDelta ConnectionTimeout() const override;
 
   // LowerLayeredPool implementation.
   bool IsStalled() const override;
 
   void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override;
@@ skipping 11 matching lines @@
     SOCKSConnectJobFactory(TransportClientSocketPool* transport_pool,
                            HostResolver* host_resolver,
                            NetLog* net_log)
         : transport_pool_(transport_pool),
           host_resolver_(host_resolver),
           net_log_(net_log) {}
 
     ~SOCKSConnectJobFactory() override {}
 
     // ClientSocketPoolBase::ConnectJobFactory methods.
-    scoped_ptr<ConnectJob> NewConnectJob(
+    std::unique_ptr<ConnectJob> NewConnectJob(
         const std::string& group_name,
         const PoolBase::Request& request,
         ConnectJob::Delegate* delegate) const override;
 
     base::TimeDelta ConnectionTimeout() const override;
 
    private:
     TransportClientSocketPool* const transport_pool_;
     HostResolver* const host_resolver_;
     NetLog* net_log_;
 
     DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJobFactory);
   };
 
   TransportClientSocketPool* const transport_pool_;
   PoolBase base_;
 
   DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocketPool);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_