Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / jingle / glue / task_pump.h

diff --git a/src/jingle/glue/task_pump.h b/src/jingle/glue/task_pump.h
index 17ce689..aae8f7d 100644 (file)
--- a/src/jingle/glue/task_pump.h
+++ b/src/jingle/glue/task_pump.h
@@ -8,18 +8,18 @@
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "third_party/libjingle/source/talk/base/taskrunner.h"
+#include "third_party/webrtc/base/taskrunner.h"
 
 namespace jingle_glue {
 
-// talk_base::TaskRunner implementation that works on chromium threads.
-class TaskPump : public talk_base::TaskRunner, public base::NonThreadSafe {
+// rtc::TaskRunner implementation that works on chromium threads.
+class TaskPump : public rtc::TaskRunner, public base::NonThreadSafe {
  public:
   TaskPump();
 
   virtual ~TaskPump();
 
-  // talk_base::TaskRunner implementation.
+  // rtc::TaskRunner implementation.
   virtual void WakeTasks() OVERRIDE;
   virtual int64 CurrentTime() OVERRIDE;
 
@@ -30,10 +30,11 @@ class TaskPump : public talk_base::TaskRunner, public base::NonThreadSafe {
  private:
   void CheckAndRunTasks();
 
-  base::WeakPtrFactory<TaskPump> weak_factory_;
   bool posted_wake_;
   bool stopped_;
 
+  base::WeakPtrFactory<TaskPump> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(TaskPump);
 };