Convert //remoting to use std::unique_ptr

remoting/host/daemon_process_unittest.cc

 // 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.
 
+#include "remoting/host/daemon_process.h"
+
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/process/process.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/host/chromoting_messages.h"
-#include "remoting/host/daemon_process.h"
 #include "remoting/host/desktop_session.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gmock_mutant.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::AnyNumber;
 using testing::InSequence;
 
 namespace remoting {
@@ skipping 23 matching lines @@
 };
 
 class MockDaemonProcess : public DaemonProcess {
  public:
   MockDaemonProcess(
       scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
       scoped_refptr<AutoThreadTaskRunner> io_task_runner,
       const base::Closure& stopped_callback);
   ~MockDaemonProcess() override;
 
-  scoped_ptr<DesktopSession> DoCreateDesktopSession(
+  std::unique_ptr<DesktopSession> DoCreateDesktopSession(
       int terminal_id,
       const ScreenResolution& resolution,
       bool virtual_terminal) override;
 
   bool OnMessageReceived(const IPC::Message& message) override;
   void SendToNetwork(IPC::Message* message) override;
 
   MOCK_METHOD1(Received, void(const IPC::Message&));
   MOCK_METHOD1(Sent, void(const IPC::Message&));
 
@@ skipping 18 matching lines @@
 MockDaemonProcess::MockDaemonProcess(
     scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
     scoped_refptr<AutoThreadTaskRunner> io_task_runner,
     const base::Closure& stopped_callback)
     : DaemonProcess(caller_task_runner, io_task_runner, stopped_callback) {
 }
 
 MockDaemonProcess::~MockDaemonProcess() {
 }
 
-scoped_ptr<DesktopSession> MockDaemonProcess::DoCreateDesktopSession(
+std::unique_ptr<DesktopSession> MockDaemonProcess::DoCreateDesktopSession(
     int terminal_id,
     const ScreenResolution& resolution,
     bool virtual_terminal) {
-  return make_scoped_ptr(DoCreateDesktopSessionPtr(terminal_id));
+  return base::WrapUnique(DoCreateDesktopSessionPtr(terminal_id));
 }
 
 bool MockDaemonProcess::OnMessageReceived(const IPC::Message& message) {
   // Notify the mock method.
   Received(message);
 
   // Call the actual handler.
   return DaemonProcess::OnMessageReceived(message);
 }
 
@@ skipping 26 matching lines @@
 
   void StartDaemonProcess();
 
   const DaemonProcess::DesktopSessionList& desktop_sessions() const {
     return daemon_process_->desktop_sessions();
   }
 
  protected:
   base::MessageLoopForIO message_loop_;
 
-  scoped_ptr<MockDaemonProcess> daemon_process_;
+  std::unique_ptr<MockDaemonProcess> daemon_process_;
   int terminal_id_;
 };
 
 DaemonProcessTest::DaemonProcessTest() : terminal_id_(0) {
 }
 
 DaemonProcessTest::~DaemonProcessTest() {
 }
 
 void DaemonProcessTest::SetUp() {
@@ skipping 172 matching lines @@
   EXPECT_EQ(1u, desktop_sessions().size());
   EXPECT_EQ(id, desktop_sessions().front()->id());
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
       ChromotingNetworkHostMsg_ConnectTerminal(id, resolution, false)));
   EXPECT_TRUE(desktop_sessions().empty());
   EXPECT_EQ(0, terminal_id_);
 }
 
 }  // namespace remoting