Convert //remoting to use std::unique_ptr

remoting/protocol/port_allocator.cc

 // Copyright 2016 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 "remoting/protocol/port_allocator.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 23 matching lines @@
 }
 
 const int kNumRetries = 5;
 
 }  // namespace
 
 namespace remoting {
 namespace protocol {
 
 PortAllocator::PortAllocator(
-    scoped_ptr<rtc::NetworkManager> network_manager,
-    scoped_ptr<rtc::PacketSocketFactory> socket_factory,
+    std::unique_ptr<rtc::NetworkManager> network_manager,
+    std::unique_ptr<rtc::PacketSocketFactory> socket_factory,
     scoped_refptr<TransportContext> transport_context)
     : BasicPortAllocator(network_manager.get(), socket_factory.get()),
       network_manager_(std::move(network_manager)),
       socket_factory_(std::move(socket_factory)),
       transport_context_(transport_context) {
   // We always use PseudoTcp to provide a reliable channel. It provides poor
   // performance when combined with TCP-based transport, so we have to disable
   // TCP ports. ENABLE_SHARED_UFRAG flag is specified so that the same username
   // fragment is shared between all candidates.
   int flags = cricket::PORTALLOCATOR_DISABLE_TCP |
@@ skipping 47 matching lines @@
 void PortAllocatorSession::OnIceConfig(const IceConfig& ice_config) {
   ice_config_ = ice_config;
   ConfigReady(GetPortConfiguration().release());
 
   if (relay_enabled() && !ice_config_.relay_servers.empty() &&
       !ice_config_.relay_token.empty()) {
     TryCreateRelaySession();
   }
 }
 
-scoped_ptr<cricket::PortConfiguration>
+std::unique_ptr<cricket::PortConfiguration>
 PortAllocatorSession::GetPortConfiguration() {
   cricket::ServerAddresses stun_servers;
   for (const auto& host : ice_config_.stun_servers) {
     stun_servers.insert(host);
   }
 
-  scoped_ptr<cricket::PortConfiguration> config(
+  std::unique_ptr<cricket::PortConfiguration> config(
       new cricket::PortConfiguration(stun_servers, username(), password()));
 
   if (relay_enabled()) {
     for (const auto& turn_server : ice_config_.turn_servers) {
       config->AddRelay(turn_server);
     }
   }
 
   return config;
 }
@@ skipping 12 matching lines @@
   std::string host =
       ice_config_.relay_servers[attempts_ % ice_config_.relay_servers.size()];
   attempts_++;
 
   DCHECK(!username().empty());
   DCHECK(!password().empty());
   std::string url = "https://" + host + "/create_session?username=" +
                     net::EscapeUrlEncodedData(username(), false) +
                     "&password=" +
                     net::EscapeUrlEncodedData(password(), false) + "&sn=1";
-  scoped_ptr<UrlRequest> url_request =
+  std::unique_ptr<UrlRequest> url_request =
       transport_context_->url_request_factory()->CreateUrlRequest(
           UrlRequest::Type::GET, url);
   url_request->AddHeader("X-Talk-Google-Relay-Auth: " +
                          ice_config_.relay_token);
   url_request->AddHeader("X-Google-Relay-Auth: " + ice_config_.relay_token);
   url_request->AddHeader("X-Stream-Type: chromoting");
   url_request->Start(base::Bind(&PortAllocatorSession::OnSessionRequestResult,
                                 base::Unretained(this)));
   url_requests_.insert(std::move(url_request));
 }
 
 void PortAllocatorSession::OnSessionRequestResult(
     const UrlRequest::Result& result) {
   if (!result.success || result.status != net::HTTP_OK) {
     LOG(WARNING) << "Received error when allocating relay session: "
                  << result.status;
     TryCreateRelaySession();
     return;
   }
 
   StringMap map = ParseMap(result.response_body);
 
   if (!username().empty() && map["username"] != username()) {
     LOG(WARNING) << "Received unexpected username value from relay server.";
   }
   if (!password().empty() && map["password"] != password()) {
     LOG(WARNING) << "Received unexpected password value from relay server.";
   }
 
-  scoped_ptr<cricket::PortConfiguration> config = GetPortConfiguration();
+  std::unique_ptr<cricket::PortConfiguration> config = GetPortConfiguration();
 
   std::string relay_ip = map["relay.ip"];
   std::string relay_port = map["relay.udp_port"];
   unsigned relay_port_int;
 
   if (!relay_ip.empty() && !relay_port.empty() &&
       base::StringToUint(relay_port, &relay_port_int)) {
     cricket::RelayServerConfig relay_config(cricket::RELAY_GTURN);
     rtc::SocketAddress address(relay_ip, relay_port_int);
     relay_config.ports.push_back(
         cricket::ProtocolAddress(address, cricket::PROTO_UDP));
     config->AddRelay(relay_config);
   }
 
   ConfigReady(config.release());
 }
 
 }  // namespace protocol
 }  // namespace remoting