Move thread local stuff from base to base/threading and consistently use the

base namespace. This also fixes references to TLSSlot to
base::ThreadLocalStorage::Slot.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70322 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 9 insertions, 10 deletions

diff --git a/chrome_frame/buggy_bho_handling.h b/chrome_frame/buggy_bho_handling.h
index 8ed2d2c..4f1e7f5 100644
--- a/chrome_frame/buggy_bho_handling.h
+++ b/chrome_frame/buggy_bho_handling.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include "base/thread_local.h"
+#include "base/threading/thread_local.h"
 
 namespace buggy_bho {
 
@@ -84,4 +84,3 @@ class BuggyBhoTls {
 }  // end namespace buggy_bho
 
 #endif  // CHROME_FRAME_BUGGY_BHO_HANDLING_H_
-
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index b726797..aa5daff 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -26,7 +26,7 @@
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/thread.h"
-#include "base/thread_local.h"
+#include "base/threading/thread_local.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_variant.h"
 #include "grit/generated_resources.h"
diff --git a/chrome_frame/crash_reporting/crash_metrics.h b/chrome_frame/crash_reporting/crash_metrics.h
index 96a6761..a58f366 100644
--- a/chrome_frame/crash_reporting/crash_metrics.h
+++ b/chrome_frame/crash_reporting/crash_metrics.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
-#include "base/thread_local.h"
+#include "base/threading/thread_local.h"
 
 // This class provides functionality to track counters like successful page
 // loads in the host browser, total number of crashes, page loads in chrome
diff --git a/chrome_frame/metrics_service.h b/chrome_frame/metrics_service.h
index baea9c8..5976c18 100644
--- a/chrome_frame/metrics_service.h
+++ b/chrome_frame/metrics_service.h
@@ -5,8 +5,8 @@
 // This file defines a service that collects information about the user
 // experience in order to help improve future versions of the app.
 
-#ifndef CHROME_FRAME_METRICS_METRICS_SERVICE_H_
-#define CHROME_FRAME_METRICS_METRICS_SERVICE_H_
+#ifndef CHROME_FRAME_METRICS_SERVICE_H_
+#define CHROME_FRAME_METRICS_SERVICE_H_
 
 #include <map>
 #include <string>
@@ -17,7 +17,7 @@
 #include "base/metrics/histogram.h"
 #include "base/platform_thread.h"
 #include "base/scoped_ptr.h"
-#include "base/thread_local.h"
+#include "base/threading/thread_local.h"
 #include "chrome/common/metrics_helpers.h"
 
 // TODO(ananta)
@@ -153,4 +153,4 @@ class MetricsService : public MetricsServiceBase {
   DISALLOW_COPY_AND_ASSIGN(MetricsService);
 };
 
-#endif  // CHROME_FRAME_METRICS_METRICS_SERVICE_H_
+#endif  // CHROME_FRAME_METRICS_SERVICE_H_
diff --git a/chrome_frame/urlmon_moniker.h b/chrome_frame/urlmon_moniker.h
index dde70adb..ea3245c 100644
--- a/chrome_frame/urlmon_moniker.h
+++ b/chrome_frame/urlmon_moniker.h
@@ -12,7 +12,7 @@
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/thread_local.h"
+#include "base/threading/thread_local.h"
 #include "base/win/scoped_variant.h"
 #include "googleurl/src/gurl.h"
 #include "chrome_frame/utils.h"
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc
index 1cf9ec0..eb6abce 100644
--- a/chrome_frame/utils.cc
+++ b/chrome_frame/utils.cc
@@ -20,7 +20,7 @@
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "base/thread_local.h"
+#include "base/threading/thread_local.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_bstr.h"