Convert //remoting to use std::unique_ptr

remoting/host/security_key/gnubby_auth_handler_win.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/host/security_key/gnubby_auth_handler.h"
 
 #include <map>
+#include <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "remoting/base/logging.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/security_key/remote_security_key_ipc_constants.h"
@@ skipping 25 matching lines @@
 // can service the next client/request.  This system allows multiple security
 // key forwarding sessions to occur concurrently.
 // TODO(joedow): Update GnubbyAuthHandler impls to run on a separate IO thread
 //               instead of the thread it was created on: crbug.com/591739
 class GnubbyAuthHandlerWin : public GnubbyAuthHandler, public IPC::Listener {
  public:
   GnubbyAuthHandlerWin();
   ~GnubbyAuthHandlerWin() override;
 
  private:
-  typedef std::map<int, scoped_ptr<RemoteSecurityKeyIpcServer>> ActiveChannels;
+  typedef std::map<int, std::unique_ptr<RemoteSecurityKeyIpcServer>>
+      ActiveChannels;
 
   // GnubbyAuthHandler interface.
   void CreateGnubbyConnection() override;
   bool IsValidConnectionId(int gnubby_connection_id) const override;
   void SendClientResponse(int gnubby_connection_id,
                           const std::string& response) override;
   void SendErrorAndCloseConnection(int gnubby_connection_id) override;
   void SetSendMessageCallback(const SendMessageCallback& callback) override;
   size_t GetActiveConnectionCountForTest() const override;
   void SetRequestTimeoutForTest(base::TimeDelta timeout) override;
@@ skipping 31 matching lines @@
 
   // The amount of time to wait for a client to process the connection details
   // message and disconnect from the IPC server channel before disconnecting it.
   base::TimeDelta disconnect_timeout_;
 
   // Used to recreate the IPC server channel if a client forgets to disconnect.
   base::OneShotTimer timer_;
 
   // IPC Clients connect to this channel first to receive their own IPC
   // channel to start a security key forwarding session on.
-  scoped_ptr<IPC::Channel> ipc_server_channel_;
+  std::unique_ptr<IPC::Channel> ipc_server_channel_;
 
   // Ensures GnubbyAuthHandlerWin methods are called on the same thread.
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(GnubbyAuthHandlerWin);
 };
 
-scoped_ptr<GnubbyAuthHandler> GnubbyAuthHandler::Create(
+std::unique_ptr<GnubbyAuthHandler> GnubbyAuthHandler::Create(
     const SendMessageCallback& callback) {
-  scoped_ptr<GnubbyAuthHandler> auth_handler(new GnubbyAuthHandlerWin());
+  std::unique_ptr<GnubbyAuthHandler> auth_handler(new GnubbyAuthHandlerWin());
   auth_handler->SetSendMessageCallback(callback);
   return auth_handler;
 }
 
 GnubbyAuthHandlerWin::GnubbyAuthHandlerWin()
     : disconnect_timeout_(
           base::TimeDelta::FromSeconds(kInitialRequestTimeoutSeconds)) {}
 
 GnubbyAuthHandlerWin::~GnubbyAuthHandlerWin() {}
 
@@ skipping 88 matching lines @@
 
   timer_.Start(FROM_HERE, disconnect_timeout_,
                base::Bind(&GnubbyAuthHandlerWin::OnChannelError,
                           base::Unretained(this)));
 
   // TODO(joedow): Use |peer_pid| to determine the originating session
   // using ProcessIdToSessionId() and verify it is the one we created.
   // Tracked via crbug.com/591746
 
   int new_connection_id = ++last_connection_id_;
-  scoped_ptr<RemoteSecurityKeyIpcServer> ipc_server(
+  std::unique_ptr<RemoteSecurityKeyIpcServer> ipc_server(
       RemoteSecurityKeyIpcServer::Create(
           new_connection_id, disconnect_timeout_, send_message_callback_,
           base::Bind(&GnubbyAuthHandlerWin::CloseSecurityKeyRequestIpcChannel,
                      base::Unretained(this), new_connection_id)));
 
   std::string unique_channel_name = GenerateUniqueChannelName();
   if (ipc_server->CreateChannel(
           unique_channel_name,
           base::TimeDelta::FromSeconds(kGnubbyRequestTimeoutSeconds))) {
     active_channels_[new_connection_id] = std::move(ipc_server);
     ipc_server_channel_->Send(
         new ChromotingNetworkToRemoteSecurityKeyMsg_ConnectionDetails(
             unique_channel_name));
   }
 }
 
 void GnubbyAuthHandlerWin::OnChannelError() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Could be an error, most likely the client disconnected though.  Either way
   // we should restart the server to prepare for the next connection.
   RecreateIpcServerChannel();
 }
 
 }  // namespace remoting