Fix in-use updates for Chrome Frame.

base/threading/thread_restrictions.cc

 // Copyright (c) 2010 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/threading/thread_restrictions.h"
 
 // This entire file is compiled out in Release mode.
 #ifndef NDEBUG
 
 #include "base/lazy_instance.h"
@@ skipping 15 matching lines @@
 // static
 bool ThreadRestrictions::SetIOAllowed(bool allowed) {
   bool previous_disallowed = g_io_disallowed.Get().Get();
   g_io_disallowed.Get().Set(!allowed);
   return !previous_disallowed;
 }
 
 // static
 void ThreadRestrictions::AssertIOAllowed() {
   if (g_io_disallowed.Get().Get()) {
-    LOG(FATAL) <<
+    LOG(ERROR) <<

[grt (UTC plus 2), 2011/09/23 04:18:42]

uh, obviously this wasn't supposed to be included.  i'm still lering git.  i
made this change in a branch between this one and my master.  i guess the cl
upload stuff includes everything between this branch and the master.  i wonder
if i can control that?  i'll remove this tomorrow.

[robertshield, 2011/09/23 14:22:18]

Ok, please remove, I suspect that this would make a few people unhappy :-)

         "Function marked as IO-only was called from a thread that "
         "disallows IO!  If this thread really should be allowed to "
         "make IO calls, adjust the call to "
         "base::ThreadRestrictions::SetIOAllowed() in this thread's "
         "startup.";
   }
 }
 
 bool ThreadRestrictions::SetSingletonAllowed(bool allowed) {
   bool previous_disallowed = g_singleton_disallowed.Get().Get();
   g_singleton_disallowed.Get().Set(!allowed);
   return !previous_disallowed;
 }
 
 // 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