Update To 11.40.268.0

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

diff --git a/src/third_party/libjingle/source/talk/xmpp/xmpptask.h b/src/third_party/libjingle/source/talk/xmpp/xmpptask.h
index 6a88f98..a8d1124 100644 (file)
--- a/src/third_party/libjingle/source/talk/xmpp/xmpptask.h
+++ b/src/third_party/libjingle/source/talk/xmpp/xmpptask.h
@@ -28,12 +28,12 @@
 #ifndef TALK_XMPP_XMPPTASK_H_
 #define TALK_XMPP_XMPPTASK_H_
 
-#include <string>
 #include <deque>
-#include "talk/base/sigslot.h"
-#include "talk/base/task.h"
-#include "talk/base/taskparent.h"
-#include "talk/xmpp/xmppengine.h"
+#include <string>
+#include "webrtc/libjingle/xmpp/xmppengine.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/task.h"
+#include "webrtc/base/taskparent.h"
 
 namespace buzz {
 
@@ -94,9 +94,9 @@ class XmppClientInterface {
 // We really ought to inherit from a TaskParentInterface, but we tried
 // that and it's way too complicated to change
 // Task/TaskParent/TaskRunner.  For now, this works.
-class XmppTaskParentInterface : public talk_base::Task {
+class XmppTaskParentInterface : public rtc::Task {
  public:
-  explicit XmppTaskParentInterface(talk_base::TaskParent* parent)
+  explicit XmppTaskParentInterface(rtc::TaskParent* parent)
       : Task(parent) {
   }
   virtual ~XmppTaskParentInterface() {}
@@ -176,7 +176,7 @@ private:
 
   bool stopped_;
   std::deque<XmlElement*> stanza_queue_;
-  talk_base::scoped_ptr<XmlElement> next_stanza_;
+  rtc::scoped_ptr<XmlElement> next_stanza_;
   std::string id_;
 
 #ifdef _DEBUG