From c91775096768e4a75b23a910ddc1e33d9412a3be Mon Sep 17 00:00:00 2001
From: "brettw@chromium.org"
 <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 1 Jan 2011 04:48:49 +0000
Subject: Move non_thread_safe from base to base/threading and into the base
 namespace.

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6005010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70351 0039d316-1c4b-4281-b951-d872f2087c98
---
 jingle/notifier/base/task_pump.h              | 4 ++--
 jingle/notifier/base/weak_xmpp_client.h       | 4 ++--
 jingle/notifier/base/xmpp_connection.h        | 4 ++--
 jingle/notifier/listener/talk_mediator_impl.h | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'jingle')

diff --git a/jingle/notifier/base/task_pump.h b/jingle/notifier/base/task_pump.h
index ff8411a..fb0a7eb 100644
--- a/jingle/notifier/base/task_pump.h
+++ b/jingle/notifier/base/task_pump.h
@@ -5,8 +5,8 @@
 #ifndef JINGLE_NOTIFIER_BASE_TASK_PUMP_H_
 #define JINGLE_NOTIFIER_BASE_TASK_PUMP_H_
 
-#include "base/non_thread_safe.h"
 #include "base/task.h"
+#include "base/threading/non_thread_safe.h"
 #include "talk/base/taskrunner.h"
 
 namespace notifier {
@@ -24,7 +24,7 @@ class TaskPump : public talk_base::TaskRunner {
  private:
   void CheckAndRunTasks();
 
-  NonThreadSafe non_thread_safe_;
+  base::NonThreadSafe non_thread_safe_;
   ScopedRunnableMethodFactory<TaskPump> scoped_runnable_method_factory_;
   bool posted_wake_;
 
diff --git a/jingle/notifier/base/weak_xmpp_client.h b/jingle/notifier/base/weak_xmpp_client.h
index adda962..411e5b9 100644
--- a/jingle/notifier/base/weak_xmpp_client.h
+++ b/jingle/notifier/base/weak_xmpp_client.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "base/non_thread_safe.h"
+#include "base/threading/non_thread_safe.h"
 #include "base/weak_ptr.h"
 #include "talk/xmpp/xmppclient.h"
 
@@ -43,7 +43,7 @@ class WeakXmppClient : public buzz::XmppClient {
   virtual void Stop();
 
  private:
-  NonThreadSafe non_thread_safe_;
+  base::NonThreadSafe non_thread_safe_;
   // We use our own WeakPtrFactory instead of inheriting from
   // SupportsWeakPtr since we want to invalidate in other places
   // besides the destructor.
diff --git a/jingle/notifier/base/xmpp_connection.h b/jingle/notifier/base/xmpp_connection.h
index 6df2c9e..4be6197 100644
--- a/jingle/notifier/base/xmpp_connection.h
+++ b/jingle/notifier/base/xmpp_connection.h
@@ -9,8 +9,8 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "base/non_thread_safe.h"
 #include "base/scoped_ptr.h"
+#include "base/threading/non_thread_safe.h"
 #include "base/weak_ptr.h"
 #include "talk/base/sigslot.h"
 #include "talk/xmpp/xmppengine.h"
@@ -84,7 +84,7 @@ class XmppConnection : public sigslot::has_slots<> {
 
   void ClearClient();
 
-  NonThreadSafe non_thread_safe_;
+  base::NonThreadSafe non_thread_safe_;
   scoped_ptr<TaskPump> task_pump_;
   base::WeakPtr<WeakXmppClient> weak_xmpp_client_;
   bool on_connect_called_;
diff --git a/jingle/notifier/listener/talk_mediator_impl.h b/jingle/notifier/listener/talk_mediator_impl.h
index 48c284b..68b80cf 100644
--- a/jingle/notifier/listener/talk_mediator_impl.h
+++ b/jingle/notifier/listener/talk_mediator_impl.h
@@ -13,8 +13,8 @@
 #include <vector>
 
 #include "base/gtest_prod_util.h"
-#include "base/non_thread_safe.h"
 #include "base/scoped_ptr.h"
+#include "base/threading/non_thread_safe.h"
 #include "jingle/notifier/listener/mediator_thread.h"
 #include "jingle/notifier/listener/talk_mediator.h"
 #include "talk/xmpp/xmppclientsettings.h"
@@ -70,7 +70,7 @@ class TalkMediatorImpl
     unsigned int subscribed : 1;   // Subscribed to the xmpp receiving channel.
   };
 
-  NonThreadSafe non_thread_safe_;
+  base::NonThreadSafe non_thread_safe_;
 
   // Delegate, which we don't own.  May be NULL.
   TalkMediator::Delegate* delegate_;
-- 
cgit v1.1