Replace scoped_ptr with unique_ptr in webrtc/p2p/

webrtc/p2p/base/relayport_unittest.cc

 /*
  *  Copyright 2009 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include <memory>
+
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/relayport.h"
 #include "webrtc/p2p/base/relayserver.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/physicalsocketserver.h"
-#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/socketadapters.h"
 #include "webrtc/base/socketaddress.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/virtualsocketserver.h"
 
 using rtc::SocketAddress;
 
 static const SocketAddress kLocalAddress = SocketAddress("192.168.1.2", 0);
 static const SocketAddress kRelayUdpAddr = SocketAddress("99.99.99.1", 5000);
@@ skipping 143 matching lines @@
         cricket::ProtocolAddress(kRelayTcpAddr, cricket::PROTO_TCP);
 
     // Create a ssl server socket for the RelayServer.
     rtc::AsyncSocket* ssl_server_socket =
         CreateServerSocket(kRelaySslAddr);
     relay_server_->AddInternalServerSocket(ssl_server_socket,
                                            cricket::PROTO_SSLTCP);
 
     // Create a tcp server socket that listens on the fake address so
     // the relay port can attempt to connect to it.
-    rtc::scoped_ptr<rtc::AsyncSocket> tcp_server_socket(
+    std::unique_ptr<rtc::AsyncSocket> tcp_server_socket(
         CreateServerSocket(kRelayTcpAddr));
 
     // Add server addresses to the relay port and let it start.
     relay_port_->AddServerAddress(fake_protocol_address);
     relay_port_->AddServerAddress(
         cricket::ProtocolAddress(kRelaySslAddr, cricket::PROTO_SSLTCP));
     relay_port_->PrepareAddress();
     EXPECT_FALSE(relay_port_->IsReady());
 
     // Should have timed out in 3000 ms(relayport.cc, kSoftConnectTimeoutMs).
@@ skipping 44 matching lines @@
           soft_timedout_connections_[i].proto == addr->proto) {
         return true;
       }
     }
     return false;
   }
 
   typedef std::map<rtc::AsyncPacketSocket*, int> PacketMap;
 
   rtc::Thread* main_;
-  rtc::scoped_ptr<rtc::PhysicalSocketServer>
-      physical_socket_server_;
-  rtc::scoped_ptr<rtc::VirtualSocketServer> virtual_socket_server_;
+  std::unique_ptr<rtc::PhysicalSocketServer> physical_socket_server_;
+  std::unique_ptr<rtc::VirtualSocketServer> virtual_socket_server_;
   rtc::SocketServerScope ss_scope_;
   rtc::Network network_;
   rtc::BasicPacketSocketFactory socket_factory_;
   std::string username_;
   std::string password_;
-  rtc::scoped_ptr<cricket::RelayPort> relay_port_;
-  rtc::scoped_ptr<cricket::RelayServer> relay_server_;
+  std::unique_ptr<cricket::RelayPort> relay_port_;
+  std::unique_ptr<cricket::RelayServer> relay_server_;
   std::vector<cricket::ProtocolAddress> failed_connections_;
   std::vector<cricket::ProtocolAddress> soft_timedout_connections_;
   PacketMap received_packet_count_;
 };
 
 TEST_F(RelayPortTest, ConnectUdp) {
   TestConnectUdp();
 }
 
 TEST_F(RelayPortTest, ConnectTcp) {
   TestConnectTcp();
 }
 
 TEST_F(RelayPortTest, ConnectSslTcp) {
   TestConnectSslTcp();
 }