Convert //remoting to use std::unique_ptr

remoting/protocol/content_description.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/content_description.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/name_value_map.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 using buzz::QName;
 using buzz::XmlElement;
 
 namespace remoting {
@@ skipping 87 matching lines @@
     config->version = 0;
     config->codec = ChannelConfig::CODEC_UNDEFINED;
   }
 
   return true;
 }
 
 }  // namespace
 
 ContentDescription::ContentDescription(
-    scoped_ptr<CandidateSessionConfig> config,
-    scoped_ptr<buzz::XmlElement> authenticator_message)
+    std::unique_ptr<CandidateSessionConfig> config,
+    std::unique_ptr<buzz::XmlElement> authenticator_message)
     : candidate_config_(std::move(config)),
-      authenticator_message_(std::move(authenticator_message)) {
-}
+      authenticator_message_(std::move(authenticator_message)) {}
 
 ContentDescription::~ContentDescription() { }
 
 // ToXml() creates content description for chromoting session. The
 // description looks as follows:
 //   <description xmlns="google:remoting">
 //     <standard-ice/>
 //     <control transport="stream" version="1" />
 //     <event transport="datagram" version="1" />
 //     <video transport="stream" codec="vp8" version="1" />
@@ skipping 60 matching lines @@
     child = child->NextNamed(tag);
   }
   if (optional && configs->empty()) {
       // If there's no mention of the tag, implicitly assume disabled channel.
       configs->push_back(ChannelConfig::None());
   }
   return true;
 }
 
 // static
-scoped_ptr<ContentDescription> ContentDescription::ParseXml(
+std::unique_ptr<ContentDescription> ContentDescription::ParseXml(
     const XmlElement* element,
     bool webrtc_transport) {
   if (element->Name() != QName(kChromotingXmlNamespace, kDescriptionTag)) {
     LOG(ERROR) << "Invalid description: " << element->Str();
     return nullptr;
   }
-  scoped_ptr<CandidateSessionConfig> config(
+  std::unique_ptr<CandidateSessionConfig> config(
       CandidateSessionConfig::CreateEmpty());
 
   config->set_webrtc_supported(webrtc_transport);
 
   if (element->FirstNamed(QName(kChromotingXmlNamespace, kStandardIceTag)) !=
       nullptr) {
     config->set_ice_supported(true);
     if (!ParseChannelConfigs(element, kControlTag, false, false,
                              config->mutable_control_configs()) ||
         !ParseChannelConfigs(element, kEventTag, false, false,
                              config->mutable_event_configs()) ||
         !ParseChannelConfigs(element, kVideoTag, true, false,
                              config->mutable_video_configs()) ||
         !ParseChannelConfigs(element, kAudioTag, true, true,
                              config->mutable_audio_configs())) {
       return nullptr;
     }
   }
 
   // Check if VP9 experiment is enabled.
   if (element->FirstNamed(QName(kChromotingXmlNamespace, kVp9ExperimentTag))) {
     config->set_vp9_experiment_enabled(true);
   }
 
-  scoped_ptr<XmlElement> authenticator_message;
+  std::unique_ptr<XmlElement> authenticator_message;
   const XmlElement* child = Authenticator::FindAuthenticatorMessage(element);
   if (child)
     authenticator_message.reset(new XmlElement(*child));
 
-  return make_scoped_ptr(new ContentDescription(
+  return base::WrapUnique(new ContentDescription(
       std::move(config), std::move(authenticator_message)));
 }
 
 }  // namespace protocol
 }  // namespace remoting