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

base/thread.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 "base/thread.h"
 
-#include "base/singleton.h"
+#include "base/lazy_instance.h"
 #include "base/string_util.h"
 #include "base/thread_local.h"
 #include "base/waitable_event.h"
 
 namespace base {
 
 // This task is used to trigger the message loop to exit.
 class ThreadQuitTask : public Task {
  public:
   virtual void Run() {
@@ skipping 19 matching lines @@
       thread_(0),
       message_loop_(NULL),
       thread_id_(0),
       name_(name) {
 }
 
 Thread::~Thread() {
   Stop();
 }
 
+namespace {
+
 // We use this thread-local variable to record whether or not a thread exited
 // because its Stop method was called.  This allows us to catch cases where
 // MessageLoop::Quit() is called directly, which is unexpected when using a
 // Thread to setup and run a MessageLoop.
-namespace {
-
-// Use a differentiating type to make sure we don't share our boolean we any
-// other Singleton<ThreadLocalBoolean>'s.
-struct ThreadExitedDummyDiffType { };
-typedef Singleton<ThreadLocalBoolean,
-                  DefaultSingletonTraits<ThreadLocalBoolean>,
-                  ThreadExitedDummyDiffType> ThreadExitedSingleton;
+base::LazyInstance<base::ThreadLocalBoolean> lazy_tls_bool(
+    base::LINKER_INITIALIZED);
 
 }  // namespace
 
 void Thread::SetThreadWasQuitProperly(bool flag) {
-  ThreadExitedSingleton::get()->Set(flag);
+  lazy_tls_bool.Pointer()->Set(flag);
 }
 
 bool Thread::GetThreadWasQuitProperly() {
   bool quit_properly = true;
 #ifndef NDEBUG
-  quit_properly = ThreadExitedSingleton::get()->Get();
+  quit_properly = lazy_tls_bool.Pointer()->Get();
 #endif
   return quit_properly;
 }
 
 bool Thread::Start() {
   return StartWithOptions(Options());
 }
 
 bool Thread::StartWithOptions(const Options& options) {
   DCHECK(!message_loop_);
@@ skipping 83 matching lines @@
   CleanUp();
 
   // Assert that MessageLoop::Quit was called by ThreadQuitTask.
   DCHECK(GetThreadWasQuitProperly());
 
   // We can't receive messages anymore.
   message_loop_ = NULL;
 }
 
 }  // namespace base