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

chrome/common/notification_service.cc

 // 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.
 
 #include "chrome/common/notification_service.h"
 
-// TODO(evanm): This shouldn't depend on static initialization.
+#include "base/lazy_instance.h"
+#include "base/thread_local.h"
+
+static base::LazyInstance<base::ThreadLocalPointer<NotificationService> >
+    lazy_tls_ptr(base::LINKER_INITIALIZED);
+
 // static
-TLSSlot NotificationService::tls_index_;
+NotificationService* NotificationService::current() {
+  return lazy_tls_ptr.Pointer()->Get();
+}
 
 // static
 bool NotificationService::HasKey(const NotificationSourceMap& map,
                                  const NotificationSource& source) {
   return map.find(source.map_key()) != map.end();
 }
 
 NotificationService::NotificationService() {
   DCHECK(current() == NULL);
 #ifndef NDEBUG
   memset(observer_counts_, 0, sizeof(observer_counts_));
 #endif
 
-  tls_index_.Set(this);
+  lazy_tls_ptr.Pointer()->Set(this);
 }
 
 void NotificationService::AddObserver(NotificationObserver* observer,
                                       NotificationType type,
                                       const NotificationSource& source) {
   DCHECK(type < NOTIFICATION_TYPE_COUNT);
 
   NotificationObserverList* observer_list;
   if (HasKey(observers_[type], source)) {
     observer_list = observers_[type][source.map_key()];
@@ skipping 53 matching lines @@
                       Observe(type, source, details));
   // Notify observers of the given type and the given source
   if (HasKey(observers_[type], source))
     FOR_EACH_OBSERVER(NotificationObserver,
                       *observers_[type][source.map_key()],
                       Observe(type, source, details));
 }
 
 
 NotificationService::~NotificationService() {
-  tls_index_.Set(NULL);
+  lazy_tls_ptr.Pointer()->Set(NULL);
 
 #ifndef NDEBUG
   for (int i = 0; i < NOTIFICATION_TYPE_COUNT; i++) {
     if (observer_counts_[i] > 0) {
       LOG(WARNING) << observer_counts_[i] << " notification observer(s) leaked"
           << " of notification type " << i;
     }
   }
 #endif
 
   for (int i = 0; i < NOTIFICATION_TYPE_COUNT; i++) {
     NotificationSourceMap omap = observers_[i];
     for (NotificationSourceMap::iterator it = omap.begin();
          it != omap.end(); ++it) {
       delete it->second;
     }
   }
 }
 
 NotificationObserver::~NotificationObserver() {}