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

2 files changed, 4 insertions, 4 deletions

diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index ffd4f88..9d4347d 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -13,9 +13,9 @@
 #include "base/debug/leak_tracker.h"
 #include "base/linked_ptr.h"
 #include "base/logging.h"
-#include "base/non_thread_safe.h"
 #include "base/ref_counted.h"
 #include "base/string16.h"
+#include "base/threading/non_thread_safe.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_states.h"
 #include "net/base/net_log.h"
@@ -57,7 +57,7 @@ namespace net {
 //
 // NOTE: All usage of all instances of this class should be on the same thread.
 //
-class URLRequest : public NonThreadSafe {
+class URLRequest : public base::NonThreadSafe {
  public:
   // Derive from this class and add your own data members to associate extra
   // information with a URLRequest. Use GetUserData(key) and SetUserData()
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 307da44..517148e 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -11,8 +11,8 @@
 #define NET_URL_REQUEST_URL_REQUEST_CONTEXT_H_
 #pragma once
 
-#include "base/non_thread_safe.h"
 #include "base/ref_counted.h"
+#include "base/threading/non_thread_safe.h"
 #include "net/base/net_log.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/transport_security_state.h"
@@ -39,7 +39,7 @@ class URLRequest;
 // instances.
 class URLRequestContext
     : public base::RefCountedThreadSafe<URLRequestContext>,
-      public NonThreadSafe {
+      public base::NonThreadSafe {
  public:
   URLRequestContext();