Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / xmpp / pubsubstateclient.h

diff --git a/src/third_party/libjingle/source/talk/xmpp/pubsubstateclient.h b/src/third_party/libjingle/source/talk/xmpp/pubsubstateclient.h
index f38658d..2acbdaa 100644 (file)
--- a/src/third_party/libjingle/source/talk/xmpp/pubsubstateclient.h
+++ b/src/third_party/libjingle/source/talk/xmpp/pubsubstateclient.h
@@ -32,14 +32,14 @@
 #include <string>
 #include <vector>
 
-#include "talk/base/scoped_ptr.h"
-#include "talk/base/sigslot.h"
-#include "talk/base/sigslotrepeater.h"
+#include "talk/xmllite/qname.h"
+#include "talk/xmllite/xmlelement.h"
 #include "talk/xmpp/constants.h"
 #include "talk/xmpp/jid.h"
 #include "talk/xmpp/pubsubclient.h"
-#include "talk/xmllite/qname.h"
-#include "talk/xmllite/xmlelement.h"
+#include "webrtc/base/scoped_ptr.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/sigslotrepeater.h"
 
 namespace buzz {
 
@@ -273,8 +273,8 @@ class PubSubStateClient : public sigslot::has_slots<> {
   PubSubClient* client_;
   const QName state_name_;
   C default_state_;
-  talk_base::scoped_ptr<PubSubStateKeySerializer> key_serializer_;
-  talk_base::scoped_ptr<PubSubStateSerializer<C> > state_serializer_;
+  rtc::scoped_ptr<PubSubStateKeySerializer> key_serializer_;
+  rtc::scoped_ptr<PubSubStateSerializer<C> > state_serializer_;
   // key => state
   std::map<std::string, C> state_by_key_;
   // itemid => StateItemInfo