Remove diagnostic CHECKs in BrowserCloseManager.
These were added in the below CL, which also made changes to browser.cc.
Those changes seem to have fixed the crashes in the bug, so these
CHECKs are no longer needed.
This partially reverts commit 75d58b152e3f0ec32a9f1a8392acbb5ebf2d1705.
(https://codereview.chromium.org/1201083002)
BUG=484951
Review URL: https://codereview.chromium.org/1244083003
Cr-Commit-Position: refs/heads/master@{#340850}
diff --git a/chrome/browser/lifetime/browser_close_manager.h b/chrome/browser/lifetime/browser_close_manager.h
index c74dca8..0e2c4a7 100644
--- a/chrome/browser/lifetime/browser_close_manager.h
+++ b/chrome/browser/lifetime/browser_close_manager.h
@@ -7,28 +7,22 @@
#include "base/callback_forward.h"
#include "base/memory/ref_counted.h"
-#include "chrome/browser/ui/browser_list_observer.h"
class Browser;
// Manages confirming that browser windows are closeable and closing them at
// shutdown.
-class BrowserCloseManager : public base::RefCounted<BrowserCloseManager>,
- public chrome::BrowserListObserver {
+class BrowserCloseManager : public base::RefCounted<BrowserCloseManager> {
public:
BrowserCloseManager();
// Starts closing all browser windows.
void StartClosingBrowsers();
- // BrowserListObserver:
- void OnBrowserAdded(Browser* browser) override;
- void OnBrowserRemoved(Browser* browser) override;
-
protected:
friend class base::RefCounted<BrowserCloseManager>;
- ~BrowserCloseManager() override;
+ virtual ~BrowserCloseManager();
virtual void ConfirmCloseWithPendingDownloads(
int download_count,
@@ -63,13 +57,6 @@
// OnBrowserReportCloseable.
Browser* current_browser_;
- // Whether we are currently iterating over browsers in CloseBrowsers().
- // No Browsers should be added or removed synchronously or concurrently,
- // except explicitly by CloseBrowsers().
- // This was added to investigate http://crbug.com/484951.
- // TODO(jackhou): Delete when no longer needed.
- bool iterating_over_browsers_during_shutdown_;
-
DISALLOW_COPY_AND_ASSIGN(BrowserCloseManager);
};
