Allow overriding of X error functions

chrome/browser/chromeos/tab_closeable_state_watcher.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 "chrome/browser/chromeos/tab_closeable_state_watcher.h"
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
 
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 49 matching lines @@
       signing_off_(false),
       bwsi_session_(
           CommandLine::ForCurrentProcess()->HasSwitch(switches::kBWSI)) {
   BrowserList::AddObserver(this);
   notification_registrar_.Add(this, NotificationType::APP_EXITING,
       NotificationService::AllSources());
 }
 
 TabCloseableStateWatcher::~TabCloseableStateWatcher() {
   BrowserList::RemoveObserver(this);
-  DCHECK(tabstrip_watchers_.empty());
+  if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers())
+    DCHECK(tabstrip_watchers_.empty());
 }
 
 bool TabCloseableStateWatcher::CanCloseTab(const Browser* browser) const {
   return browser->type() != Browser::TYPE_NORMAL ? true : can_close_tab_;
 }
 
 bool TabCloseableStateWatcher::CanCloseBrowser(Browser* browser) {
   BrowserActionType action_type;
   bool can_close = CanCloseBrowserImpl(browser, &action_type);
   if (action_type == OPEN_WINDOW) {
@@ skipping 157 matching lines @@
   if (!can_close_tab_)
     return false;
 
   // Otherwise, close existing tabs, and deny closing of browser.
   // TabClosingAt will open NTP when the last tab is being closed.
   *action_type = OPEN_NTP;
   return false;
 }
 
 }  // namespace chromeos