Replace scoped_ptr with unique_ptr in webrtc/libjingle/

webrtc/libjingle/xmpp/chatroommoduleimpl.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <algorithm>
 #include <iostream>
 #include <map>
+#include <memory>
 #include <sstream>
 #include <string>
 #include <vector>
 #include "webrtc/libjingle/xmpp/chatroommodule.h"
 #include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/libjingle/xmpp/moduleimpl.h"
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/common.h"
 
 namespace buzz {
@@ skipping 74 matching lines @@
   ~XmppChatroomMemberImpl() {}
   XmppReturnStatus SetPresence(const XmppPresence* presence);
 
   // XmppChatroomMember
   const Jid member_jid() const;
   const Jid full_jid() const;
   const std::string name() const;
   const XmppPresence* presence() const;
 
 private:
-  rtc::scoped_ptr<XmppPresence>  presence_;
+  std::unique_ptr<XmppPresence>  presence_;
 };
 
 class XmppChatroomMemberEnumeratorImpl :
         public XmppChatroomMemberEnumerator  {
 public:
   XmppChatroomMemberEnumeratorImpl(XmppChatroomModuleImpl::JidMemberMap* chatroom_jid_members,
                                         int* map_version);
 
   // XmppChatroomMemberEnumerator
   virtual XmppChatroomMember* current();
@@ skipping 304 matching lines @@
   { XMPP_CHATROOM_STATE_REQUESTED_EXIT,  XMPP_CHATROOM_STATE_REQUESTED_ENTER, false, false, TRANSITION_TYPE_NONE, },
   { XMPP_CHATROOM_STATE_REQUESTED_EXIT,  XMPP_CHATROOM_STATE_IN_ROOM,         false, false, TRANSITION_TYPE_NONE, },
 };
 
 
 
 void
 XmppChatroomModuleImpl::FireEnteredStatus(const XmlElement* presence,
                                           XmppChatroomEnteredStatus status) {
   if (chatroom_handler_) {
-    rtc::scoped_ptr<XmppPresence> xmpp_presence(XmppPresence::Create());
+    std::unique_ptr<XmppPresence> xmpp_presence(XmppPresence::Create());
     xmpp_presence->set_raw_xml(presence);
     chatroom_handler_->ChatroomEnteredStatus(this, xmpp_presence.get(), status);
   }
 }
 
 void
 XmppChatroomModuleImpl::FireExitStatus(XmppChatroomExitedStatus status) {
   if (chatroom_handler_)
     chatroom_handler_->ChatroomExitedStatus(this, status);
 }
@@ skipping 21 matching lines @@
 XmppChatroomModuleImpl::FireMemberExited(const XmppChatroomMember* exited_member) {
   if (chatroom_handler_)
     chatroom_handler_->MemberExited(this, exited_member);
 }
 
 
 XmppReturnStatus
 XmppChatroomModuleImpl::ServerChangedOtherPresence(const XmlElement&
                                                    presence_element) {
   XmppReturnStatus xmpp_status = XMPP_RETURN_OK;
-  rtc::scoped_ptr<XmppPresence> presence(XmppPresence::Create());
+  std::unique_ptr<XmppPresence> presence(XmppPresence::Create());
   IFR(presence->set_raw_xml(&presence_element));
 
   JidMemberMap::iterator pos = chatroom_jid_members_.find(presence->jid());
 
   if (pos == chatroom_jid_members_.end()) {
     if (presence->available() == XMPP_PRESENCE_AVAILABLE) {
       XmppChatroomMemberImpl* member = new XmppChatroomMemberImpl();
       member->SetPresence(presence.get());
       chatroom_jid_members_.insert(std::make_pair(member->member_jid(), member));
       chatroom_jid_members_version_++;
@@ skipping 241 matching lines @@
 }
 
 bool
 XmppChatroomMemberEnumeratorImpl::IsAfterEnd() {
   return (iterator_ == map_->end());
 }
 
 
 
 } // namespace buzz