Convert //remoting to use std::unique_ptr

remoting/protocol/fake_authenticator.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/protocol/fake_authenticator.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/callback_helpers.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/p2p_stream_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 namespace remoting {
 namespace protocol {
 
 FakeChannelAuthenticator::FakeChannelAuthenticator(bool accept, bool async)
     : result_(accept ? net::OK : net::ERR_FAILED),
       async_(async),
       weak_factory_(this) {}
 
 FakeChannelAuthenticator::~FakeChannelAuthenticator() {}
 
 void FakeChannelAuthenticator::SecureAndAuthenticate(
-    scoped_ptr<P2PStreamSocket> socket,
+    std::unique_ptr<P2PStreamSocket> socket,
     const DoneCallback& done_callback) {
   socket_ = std::move(socket);
 
   done_callback_ = done_callback;
 
   if (async_) {
     if (result_ != net::OK) {
       // Don't write anything if we are going to reject auth to make test
       // ordering deterministic.
       did_write_bytes_ = true;
@@ skipping 104 matching lines @@
     std::string key_base64 =
         message->TextNamed(buzz::QName(kChromotingXmlNamespace, "key"));
     EXPECT_TRUE(!key_base64.empty());
     EXPECT_TRUE(base::Base64Decode(key_base64, &auth_key_));
   }
 
   ++messages_;
   resume_callback.Run();
 }
 
-scoped_ptr<buzz::XmlElement> FakeAuthenticator::GetNextMessage() {
+std::unique_ptr<buzz::XmlElement> FakeAuthenticator::GetNextMessage() {
   EXPECT_EQ(MESSAGE_READY, state());
 
-  scoped_ptr<buzz::XmlElement> result(new buzz::XmlElement(
+  std::unique_ptr<buzz::XmlElement> result(new buzz::XmlElement(
       buzz::QName(kChromotingXmlNamespace, "authentication")));
   buzz::XmlElement* id = new buzz::XmlElement(
       buzz::QName(kChromotingXmlNamespace, "id"));
   id->AddText(base::IntToString(messages_));
   result->AddElement(id);
 
   // Add authentication key in the last message sent from host to client.
   if (type_ == HOST && messages_ == round_trips_ * 2 - 1) {
     auth_key_ =  base::RandBytesAsString(16);
     buzz::XmlElement* key = new buzz::XmlElement(
         buzz::QName(kChromotingXmlNamespace, "key"));
     std::string key_base64;
     base::Base64Encode(auth_key_, &key_base64);
     key->AddText(key_base64);
     result->AddElement(key);
   }
 
   ++messages_;
   return result;
 }
 
 const std::string& FakeAuthenticator::GetAuthKey() const {
   EXPECT_EQ(ACCEPTED, state());
   DCHECK(!auth_key_.empty());
   return auth_key_;
 }
 
-scoped_ptr<ChannelAuthenticator>
+std::unique_ptr<ChannelAuthenticator>
 FakeAuthenticator::CreateChannelAuthenticator() const {
   EXPECT_EQ(ACCEPTED, state());
-  return make_scoped_ptr(
+  return base::WrapUnique(
       new FakeChannelAuthenticator(action_ != REJECT_CHANNEL, async_));
 }
 
 FakeHostAuthenticatorFactory::FakeHostAuthenticatorFactory(
     int round_trips,
     int messages_till_started,
     FakeAuthenticator::Action action,
     bool async)
     : round_trips_(round_trips),
       messages_till_started_(messages_till_started),
       action_(action),
       async_(async) {}
 FakeHostAuthenticatorFactory::~FakeHostAuthenticatorFactory() {}
 
-scoped_ptr<Authenticator> FakeHostAuthenticatorFactory::CreateAuthenticator(
+std::unique_ptr<Authenticator>
+FakeHostAuthenticatorFactory::CreateAuthenticator(
     const std::string& local_jid,
     const std::string& remote_jid) {
-  scoped_ptr<FakeAuthenticator> authenticator(new FakeAuthenticator(
+  std::unique_ptr<FakeAuthenticator> authenticator(new FakeAuthenticator(
       FakeAuthenticator::HOST, round_trips_, action_, async_));
   authenticator->set_messages_till_started(messages_till_started_);
   return std::move(authenticator);
 }
 
 }  // namespace protocol
 }  // namespace remoting