Replace scoped_ptr with unique_ptr in webrtc/libjingle/

webrtc/libjingle/xmpp/rostermodule_unittest.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 <iostream>
+#include <memory>
 #include <sstream>
 #include <string>
 
 #include "webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/libjingle/xmpp/rostermodule.h"
 #include "webrtc/libjingle/xmpp/util_unittest.h"
 #include "webrtc/libjingle/xmpp/xmppengine.h"
 #include "webrtc/base/gunit.h"
-#include "webrtc/base/scoped_ptr.h"
 
 #define TEST_OK(x) EXPECT_EQ((x),XMPP_RETURN_OK)
 #define TEST_BADARGUMENT(x) EXPECT_EQ((x),XMPP_RETURN_BADARGUMENT)
 
 
 namespace buzz {
 
 class RosterModuleTest;
 
 static void
@@ skipping 211 matching lines @@
                        XmppTestHandler* handler) {
     // Needs to be similar to XmppEngineTest::RunLogin
   }
 };
 
 TEST_F(RosterModuleTest, TestPresence) {
   XmlElement* status = new XmlElement(QN_GOOGLE_PSTN_CONFERENCE_STATUS);
   status->AddAttr(QN_STATUS, STR_PSTN_CONFERENCE_STATUS_CONNECTING);
   XmlElement presence_xml(QN_PRESENCE);
   presence_xml.AddElement(status);
-  rtc::scoped_ptr<XmppPresence> presence(XmppPresence::Create());
+  std::unique_ptr<XmppPresence> presence(XmppPresence::Create());
   presence->set_raw_xml(&presence_xml);
   EXPECT_EQ(presence->connection_status(), XMPP_CONNECTION_STATUS_CONNECTING);
 }
 
 TEST_F(RosterModuleTest, TestOutgoingPresence) {
   std::stringstream dump;
 
-  rtc::scoped_ptr<XmppEngine> engine(XmppEngine::Create());
+  std::unique_ptr<XmppEngine> engine(XmppEngine::Create());
   XmppTestHandler handler(engine.get());
   XmppTestRosterHandler roster_handler;
 
-  rtc::scoped_ptr<XmppRosterModule> roster(XmppRosterModule::Create());
+  std::unique_ptr<XmppRosterModule> roster(XmppRosterModule::Create());
   roster->set_roster_handler(&roster_handler);
 
   // Configure the roster module
   roster->RegisterEngine(engine.get());
 
   // Set up callbacks
   engine->SetOutputHandler(&handler);
   engine->AddStanzaHandler(&handler);
   engine->SetSessionHandler(&handler);
 
@@ skipping 81 matching lines @@
   EXPECT_EQ(roster_handler.StrClear(), "");
   EXPECT_EQ(handler.OutputActivity(),
     "<presence type=\"unavailable\">"
       "<priority>42</priority>"
       "<status xml:lang=\"es\">Hola Amigos!</status>"
       "<status>Hey there, friend!</status>"
     "</presence>");
   EXPECT_EQ(handler.SessionActivity(), "");
 
   // Construct a directed presence
-  rtc::scoped_ptr<XmppPresence> directed_presence(XmppPresence::Create());
+  std::unique_ptr<XmppPresence> directed_presence(XmppPresence::Create());
   TEST_OK(directed_presence->set_available(XMPP_PRESENCE_AVAILABLE));
   TEST_OK(directed_presence->set_priority(120));
   TEST_OK(directed_presence->set_status("*very* available"));
   TEST_OK(roster->SendDirectedPresence(directed_presence.get(),
                                        Jid("myhoney@honey.net")));
 
   EXPECT_EQ(roster_handler.StrClear(), "");
   EXPECT_EQ(handler.OutputActivity(),
     "<presence to=\"myhoney@honey.net\">"
       "<priority>120</priority>"
       "<status>*very* available</status>"
     "</presence>");
   EXPECT_EQ(handler.SessionActivity(), "");
 }
 
 TEST_F(RosterModuleTest, TestIncomingPresence) {
-  rtc::scoped_ptr<XmppEngine> engine(XmppEngine::Create());
+  std::unique_ptr<XmppEngine> engine(XmppEngine::Create());
   XmppTestHandler handler(engine.get());
   XmppTestRosterHandler roster_handler;
 
-  rtc::scoped_ptr<XmppRosterModule> roster(XmppRosterModule::Create());
+  std::unique_ptr<XmppRosterModule> roster(XmppRosterModule::Create());
   roster->set_roster_handler(&roster_handler);
 
   // Configure the roster module
   roster->RegisterEngine(engine.get());
 
   // Set up callbacks
   engine->SetOutputHandler(&handler);
   engine->AddStanzaHandler(&handler);
   engine->SetSessionHandler(&handler);
 
@@ skipping 107 matching lines @@
                       "to=\"david@my-server/test\" type=\"unavailable\" "
                       "xmlns:cli=\"jabber:client\">"
           "<cli:status>Stealing my rug back</cli:status>"
           "<cli:priority>-10</cli:priority>"
         "</cli:presence>]");
   EXPECT_EQ(handler.OutputActivity(), "");
   handler.SessionActivity(); // Ignore the session output
 }
 
 TEST_F(RosterModuleTest, TestPresenceSubscription) {
-  rtc::scoped_ptr<XmppEngine> engine(XmppEngine::Create());
+  std::unique_ptr<XmppEngine> engine(XmppEngine::Create());
   XmppTestHandler handler(engine.get());
   XmppTestRosterHandler roster_handler;
 
-  rtc::scoped_ptr<XmppRosterModule> roster(XmppRosterModule::Create());
+  std::unique_ptr<XmppRosterModule> roster(XmppRosterModule::Create());
   roster->set_roster_handler(&roster_handler);
 
   // Configure the roster module
   roster->RegisterEngine(engine.get());
 
   // Set up callbacks
   engine->SetOutputHandler(&handler);
   engine->AddStanzaHandler(&handler);
   engine->SetSessionHandler(&handler);
 
@@ skipping 38 matching lines @@
   EXPECT_EQ(roster_handler.StrClear(), "");
   EXPECT_EQ(handler.OutputActivity(),
     "<presence to=\"maude@example.net\" type=\"subscribe\"/>"
     "<presence to=\"maude@example.net\" type=\"unsubscribe\"/>"
     "<presence to=\"maude@example.net\" type=\"subscribed\"/>"
     "<presence to=\"maude@example.net\" type=\"unsubscribed\"/>");
   EXPECT_EQ(handler.SessionActivity(), "");
 }
 
 TEST_F(RosterModuleTest, TestRosterReceive) {
-  rtc::scoped_ptr<XmppEngine> engine(XmppEngine::Create());
+  std::unique_ptr<XmppEngine> engine(XmppEngine::Create());
   XmppTestHandler handler(engine.get());
   XmppTestRosterHandler roster_handler;
 
-  rtc::scoped_ptr<XmppRosterModule> roster(XmppRosterModule::Create());
+  std::unique_ptr<XmppRosterModule> roster(XmppRosterModule::Create());
   roster->set_roster_handler(&roster_handler);
 
   // Configure the roster module
   roster->RegisterEngine(engine.get());
 
   // Set up callbacks
   engine->SetOutputHandler(&handler);
   engine->AddStanzaHandler(&handler);
   engine->SetSessionHandler(&handler);
 
@@ skipping 95 matching lines @@
       "4:[Contact jid:jesus@example.net name:Jesus Quintana "
                  "subscription_state:from groups:[Bowling League]]"
         "<ros:item jid=\"jesus@example.net\" name=\"Jesus Quintana\" "
                   "subscription=\"from\" xmlns:ros=\"jabber:iq:roster\">"
           "<ros:group>Bowling League</ros:group>"
         "</ros:item>]");
   EXPECT_EQ(handler.OutputActivity(), "");
   EXPECT_EQ(handler.SessionActivity(), "");
 
   // Request that someone be added
-  rtc::scoped_ptr<XmppRosterContact> contact(XmppRosterContact::Create());
+  std::unique_ptr<XmppRosterContact> contact(XmppRosterContact::Create());
   TEST_OK(contact->set_jid(Jid("brandt@example.net")));
   TEST_OK(contact->set_name("Brandt"));
   TEST_OK(contact->AddGroup("Business Partners"));
   TEST_OK(contact->AddGroup("Watchers"));
   TEST_OK(contact->AddGroup("Friends"));
   TEST_OK(contact->RemoveGroup("Friends")); // Maybe not...
   TEST_OK(roster->RequestRosterChange(contact.get()));
 
   EXPECT_EQ(roster_handler.StrClear(), "");
   EXPECT_EQ(handler.OutputActivity(),
@@ skipping 113 matching lines @@
                   "subscription=\"from\" "
                   "xmlns:ros=\"jabber:iq:roster\">"
           "<ros:group>Bowling League</ros:group>"
         "</ros:item> index:4]");
   EXPECT_EQ(handler.OutputActivity(),
     "<iq type=\"result\" id=\"server_3\"/>");
   EXPECT_EQ(handler.SessionActivity(), "");
 }
 
 }