Revert of Remove webrtc/base/scoped_ptr.h

webrtc/libjingle/xmpp/pubsubstateclient.h

 /*
  *  Copyright 2011 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.
  */
 
 #ifndef WEBRTC_LIBJINGLE_XMPP_PUBSUBSTATECLIENT_H_
 #define WEBRTC_LIBJINGLE_XMPP_PUBSUBSTATECLIENT_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "webrtc/libjingle/xmllite/qname.h"
 #include "webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/libjingle/xmpp/jid.h"
 #include "webrtc/libjingle/xmpp/pubsubclient.h"
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/sigslotrepeater.h"
 
 namespace buzz {
 
 // To handle retracts correctly, we need to remember certain details
 // about an item.  We could just cache the entire XML element, but
 // that would take more memory and require re-parsing.
 struct StateItemInfo {
   std::string published_nick;
@@ skipping 227 matching lines @@
   // key => state
   std::map<std::string, C> state_by_key_;
   // itemid => StateItemInfo
   std::map<std::string, StateItemInfo> info_by_itemid_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(PubSubStateClient);
 };
 }  // namespace buzz
 
 #endif  // WEBRTC_LIBJINGLE_XMPP_PUBSUBSTATECLIENT_H_