Revert 65996 (test breakage) - Disallow Singleton and LazyInstance on non-joinable threads.

Fix all known instances or explicitly allow them.  Usually the fix involves switching from Default traits to Lazy traits.

BUG=61753
TEST=none

Review URL: http://codereview.chromium.org/4635012

TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/4980001

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

1 files changed, 0 insertions, 18 deletions

diff --git a/base/thread_restrictions.cc b/base/thread_restrictions.cc
index 1f5794a..270d663 100644
--- a/base/thread_restrictions.cc
+++ b/base/thread_restrictions.cc
@@ -18,9 +18,6 @@ namespace {
 LazyInstance<ThreadLocalBoolean, LeakyLazyInstanceTraits<ThreadLocalBoolean> >
     g_io_disallowed(LINKER_INITIALIZED);
 
-LazyInstance<ThreadLocalBoolean, LeakyLazyInstanceTraits<ThreadLocalBoolean> >
-    g_singleton_disallowed(LINKER_INITIALIZED);
-
 }  // anonymous namespace
 
 // static
@@ -42,21 +39,6 @@ void ThreadRestrictions::AssertIOAllowed() {
   }
 }
 
-bool ThreadRestrictions::SetSingletonAllowed(bool allowed) {
-  bool previous_allowed = g_singleton_disallowed.Get().Get();
-  g_singleton_disallowed.Get().Set(!allowed);
-  return !previous_allowed;
-}
-
-// static
-void ThreadRestrictions::AssertSingletonAllowed() {
-  if (g_singleton_disallowed.Get().Get())
-    LOG(FATAL) << "LazyInstance/Singleton is not allowed to be used on this "
-               << "thread.  Most likely it's because this thread is not "
-               << "joinable, so AtExitManager may have deleted the object "
-               << "on shutdown, leading to a potential shutdown crash.";
-}
-
 }  // namespace base
 
 #endif  // NDEBUG