Merge 22195 - Do not abort the process if thread owning the log mutex has cra...

base/logging.cc

Index: base/logging.cc
===================================================================
--- base/logging.cc	(revision 22843)
+++ base/logging.cc	(working copy)
@@ -485,7 +485,12 @@
 
 #if defined(OS_WIN)
       DWORD r = ::WaitForSingleObject(log_mutex, INFINITE);
-      DCHECK(r != WAIT_ABANDONED);
+      if (r == WAIT_ABANDONED) {
+        // Do not abort the process here. UI tests might be crashy sometimes,
+        // and aborting the test binary only makes the problem worse.
+        // For more info see http://crbug.com/18028.
+        LOG(ERROR) << "Thread owning the log mutex has crashed.";
+      }
 #elif defined(OS_POSIX)
       pthread_mutex_lock(&log_mutex);
 #endif
Property changes on: base\logging.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/logging.cc:r69-2775
   Merged /trunk/src/base/logging.cc:r22195