chromeos: Try to avoid shutdown crash in BootTimesRecorder.

chrome/browser/chromeos/boot_times_recorder.cc

 // Copyright (c) 2012 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/browser/chromeos/boot_times_recorder.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
@@ skipping 338 matching lines @@
                  (is_user_new ? kUmaLoginNewUser : kUmaLogin),
                  kUmaLoginPrefix,
                  login_time_markers_),
       base::TimeDelta::FromMilliseconds(kLoginTimeWriteDelayMs));
 }
 
 void BootTimesRecorder::WriteLogoutTimes() {
   // Either we're on the browser thread, or (more likely) Chrome is in the
   // process of shutting down and we're on the main thread but the message loop
   // has already been terminated.
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
-         !BrowserThread::IsMessageLoopValid(BrowserThread::UI));
+  DCHECK(!BrowserThread::IsMessageLoopValid(BrowserThread::UI) ||
+         BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   WriteTimes(kLogoutTimes,
              (restart_requested_ ? kUmaRestart : kUmaLogout),
              kUmaLogoutPrefix,
              logout_time_markers_);
 }
 
 // static
 void BootTimesRecorder::ClearLogoutStartedLastPreference() {
   PrefService* local_state = g_browser_process->local_state();
@@ skipping 84 matching lines @@
                                             bool send_to_uma) {
   AddMarker(&logout_time_markers_, TimeMarker(marker_name, send_to_uma));
 }
 
 // static
 void BootTimesRecorder::AddMarker(std::vector<TimeMarker>* vector,
                                   TimeMarker marker) {
   // The marker vectors can only be safely manipulated on the main thread.
   // If we're late in the process of shutting down (eg. as can be the case at
   // logout), then we have to assume we're on the main thread already.
-  if (BrowserThread::CurrentlyOn(BrowserThread::UI) ||
-      !BrowserThread::IsMessageLoopValid(BrowserThread::UI)) {
+  if (!BrowserThread::IsMessageLoopValid(BrowserThread::UI) ||
+      BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     vector->push_back(marker);
   } else {
     // Add the marker on the UI thread.
     // Note that it's safe to use an unretained pointer to the vector because
     // BootTimesRecorder's lifetime exceeds that of the UI thread message loop.
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&BootTimesRecorder::AddMarker,
                    base::Unretained(vector),
                    marker));
@@ skipping 47 matching lines @@
           GetRenderWidgetHost(&web_contents->GetController());
       render_widget_hosts_loading_.erase(render_widget_host);
       break;
     }
     default:
       break;
   }
 }
 
 }  // namespace chromeos