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

5 files changed, 14 insertions, 11 deletions

diff --git a/chrome/browser/sync/glue/session_model_associator.h b/chrome/browser/sync/glue/session_model_associator.h
index 502af18..f2909af 100644
--- a/chrome/browser/sync/glue/session_model_associator.h
+++ b/chrome/browser/sync/glue/session_model_associator.h
@@ -13,6 +13,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/observer_list.h"
 #include "base/scoped_vector.h"
+#include "base/threading/non_thread_safe.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sync/engine/syncapi.h"
@@ -44,8 +45,10 @@ static const char kSessionsTag[] = "google_chrome_sessions";
 // that gets overwritten everytime there is an update. From it, we build a new
 // foreign session windows list each time |GetSessionData| is called by the
 // ForeignSessionHandler.
-class SessionModelAssociator : public PerDataTypeAssociatorInterface<
-    sync_pb::SessionSpecifics, std::string>, public NonThreadSafe {
+class SessionModelAssociator
+    : public PerDataTypeAssociatorInterface<sync_pb::SessionSpecifics,
+                                            std::string>,
+      public base::NonThreadSafe {
  public:
 
   // Does not take ownership of sync_service.
@@ -60,7 +63,7 @@ class SessionModelAssociator : public PerDataTypeAssociatorInterface<
 
   // Dummy method, we do everything all-at-once in UpdateFromSyncModel.
   virtual void Associate(const sync_pb::SessionSpecifics* specifics,
-    int64 sync_id) {
+      int64 sync_id) {
   }
 
   // Updates the sync model with the local client data. (calls
diff --git a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h
index ac2d0c4..a879836 100644
--- a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h
+++ b/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h
@@ -13,8 +13,8 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "base/non_thread_safe.h"
 #include "base/scoped_callback_factory.h"
+#include "base/threading/non_thread_safe.h"
 #include "base/weak_ptr.h"
 
 namespace invalidation {
@@ -52,7 +52,7 @@ class CacheInvalidationPacketHandler {
 
   void HandleInboundPacket(const std::string& packet);
 
-  NonThreadSafe non_thread_safe_;
+  base::NonThreadSafe non_thread_safe_;
   base::ScopedCallbackFactory<CacheInvalidationPacketHandler>
       scoped_callback_factory_;
 
diff --git a/chrome/browser/sync/notifier/chrome_invalidation_client.h b/chrome/browser/sync/notifier/chrome_invalidation_client.h
index e408085..99af02c 100644
--- a/chrome/browser/sync/notifier/chrome_invalidation_client.h
+++ b/chrome/browser/sync/notifier/chrome_invalidation_client.h
@@ -12,9 +12,9 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/non_thread_safe.h"
 #include "base/scoped_callback_factory.h"
 #include "base/scoped_ptr.h"
+#include "base/threading/non_thread_safe.h"
 #include "base/weak_ptr.h"
 #include "chrome/browser/sync/notifier/chrome_system_resources.h"
 #include "chrome/browser/sync/notifier/state_writer.h"
@@ -99,7 +99,7 @@ class ChromeInvalidationClient
   void HandleOutboundPacket(
       invalidation::NetworkEndpoint* const& network_endpoint);
 
-  NonThreadSafe non_thread_safe_;
+  base::NonThreadSafe non_thread_safe_;
   ChromeSystemResources chrome_system_resources_;
   base::ScopedCallbackFactory<ChromeInvalidationClient>
       scoped_callback_factory_;
diff --git a/chrome/browser/sync/notifier/chrome_system_resources.h b/chrome/browser/sync/notifier/chrome_system_resources.h
index b6e6256..06b8001 100644
--- a/chrome/browser/sync/notifier/chrome_system_resources.h
+++ b/chrome/browser/sync/notifier/chrome_system_resources.h
@@ -14,9 +14,9 @@
 #include <string>
 
 #include "base/message_loop.h"
-#include "base/non_thread_safe.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
+#include "base/threading/non_thread_safe.h"
 #include "chrome/browser/sync/notifier/state_writer.h"
 #include "google/cacheinvalidation/invalidation-client.h"
 
@@ -52,7 +52,7 @@ class ChromeSystemResources : public invalidation::SystemResources {
                           invalidation::StorageCallback* callback);
 
  private:
-  NonThreadSafe non_thread_safe_;
+  base::NonThreadSafe non_thread_safe_;
   scoped_ptr<ScopedRunnableMethodFactory<ChromeSystemResources> >
       scoped_runnable_method_factory_;
   // Holds all posted tasks that have not yet been run.
diff --git a/chrome/browser/sync/notifier/registration_manager.h b/chrome/browser/sync/notifier/registration_manager.h
index 1b1a534..2694373 100644
--- a/chrome/browser/sync/notifier/registration_manager.h
+++ b/chrome/browser/sync/notifier/registration_manager.h
@@ -12,7 +12,7 @@
 #include <map>
 
 #include "base/basictypes.h"
-#include "base/non_thread_safe.h"
+#include "base/threading/non_thread_safe.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "google/cacheinvalidation/invalidation-client.h"
 
@@ -54,7 +54,7 @@ class RegistrationManager {
 
   void OnRegister(const invalidation::RegistrationUpdateResult& result);
 
-  NonThreadSafe non_thread_safe_;
+  base::NonThreadSafe non_thread_safe_;
   // Weak pointer.
   invalidation::InvalidationClient* invalidation_client_;
   RegistrationStatusMap registration_status_;