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

chrome/common/notification_service.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file describes a central switchboard for notifications that might
 // happen in various parts of the application, and allows users to register
 // observers for various classes of events that they're interested in.
 
 #ifndef CHROME_COMMON_NOTIFICATION_SERVICE_H__
 #define CHROME_COMMON_NOTIFICATION_SERVICE_H__
 
 #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"
 #include "chrome/common/notification_types.h"
 
 class NotificationObserver;
 
 class NotificationService {
  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.
   NotificationService();
   ~NotificationService();
 
   // Registers a NotificationObserver to be called whenever a matching
   // notification is posted.  Observer is a pointer to an object subclassing
   // NotificationObserver to be notified when an event matching the other two
   // parameters is posted to this service.  Type is the type of events to
@@ skipping 44 matching lines @@
   // Convenience function to determine whether a source has a
   // NotificationObserverList in the given map;
   static bool HasKey(const NotificationSourceMap& map,
                      const NotificationSource& source);
 
   // Keeps track of the observers for each type of notification.
   // Until we get a prohibitively large number of notification types,
   // 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.
   int observer_counts_[NOTIFICATION_TYPE_COUNT];
 #endif
 
   DISALLOW_EVIL_CONSTRUCTORS(NotificationService);
 };
 
 // This is the base class for notification observers.  When a matching
 // notification is posted to the notification service, Observe is called.
 class NotificationObserver {
  public:
   virtual ~NotificationObserver();
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) = 0;
 };
 
 #endif  // CHROME_COMMON_NOTIFICATION_SERVICE_H__