Move a bunch of code from the old to new TLS interface.

chrome/common/notification_service.h

Index: chrome/common/notification_service.h
===================================================================
--- chrome/common/notification_service.h	(revision 1894)
+++ chrome/common/notification_service.h	(working copy)
@@ -12,7 +12,6 @@
 #include <map>
 
 #include "base/observer_list.h"
-#include "base/thread_local_storage.h"
 #include "base/values.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
@@ -24,9 +23,7 @@
  public:
   // Returns the NotificationService object for the current thread, or NULL if
   // none.
-  static NotificationService* current() {
-    return static_cast<NotificationService *>(tls_index_.Get());
-  }
+  static NotificationService* current();
 
   // Normally instantiated when the thread is created.  Not all threads have
   // a NotificationService.  Only one instance should be created per thread.
@@ -91,10 +88,6 @@
   // a simple array is probably the fastest way to dispatch.
   NotificationSourceMap observers_[NOTIFICATION_TYPE_COUNT];
 
-  // The thread local storage index, used for getting the current thread's
-  // instance.
-  static TLSSlot tls_index_;
-
 #ifndef NDEBUG
   // Used to check to see that AddObserver and RemoveObserver calls are
   // balanced.