chrome: Remove 11 exit time destructors and 4 static initializers.

chrome/browser/ui/browser_list.cc

Index: chrome/browser/ui/browser_list.cc
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc
index 18fea4e96c165cf6800d52b32df9a6f08c46a80c..d64509f1de51c08ad845d98a2eb6fd91d645ddbe 100644
--- a/chrome/browser/ui/browser_list.cc
+++ b/chrome/browser/ui/browser_list.cc
@@ -117,6 +117,21 @@ const int kMatchOriginalProfile         = 1 << 0;
 const int kMatchCanSupportWindowFeature = 1 << 1;
 const int kMatchTabbed                  = 1 << 2;
 
+static BrowserList::BrowserVector& browsers() {
+  CR_DEFINE_STATIC_LOCAL(BrowserList::BrowserVector, b, ());

[Mark Mentovai, 2011/11/16 22:54:24]

Something better than b? (And b on 126 and o on 131?)

[Nico, 2011/11/16 22:59:20]

c?

+  return b;
+}
+
+static BrowserList::BrowserVector& last_active_browsers() {
+  CR_DEFINE_STATIC_LOCAL(BrowserList::BrowserVector, b, ());
+  return b;
+}
+
+static ObserverList<BrowserList::Observer>& observers() {
+  CR_DEFINE_STATIC_LOCAL(ObserverList<BrowserList::Observer>, o, ());
+  return o;
+}
+
 // Returns true if the specified |browser| matches the specified arguments.
 // |match_types| is a bitmask dictating what parameters to match:
 // . If it contains kMatchOriginalProfile then the original profile of the
@@ -251,13 +266,10 @@ void NotifyWindowManagerAboutSignout() {
 
 }  // namespace
 
-BrowserList::BrowserVector BrowserList::browsers_;
-ObserverList<BrowserList::Observer> BrowserList::observers_;
-
 // static
 void BrowserList::AddBrowser(Browser* browser) {
   DCHECK(browser);
-  browsers_.push_back(browser);
+  browsers().push_back(browser);
 
   g_browser_process->AddRefModule();
 
@@ -271,9 +283,9 @@ void BrowserList::AddBrowser(Browser* browser) {
 
   // Send out notifications after add has occurred. Do some basic checking to
   // try to catch evil observers that change the list from under us.
-  size_t original_count = observers_.size();
-  FOR_EACH_OBSERVER(Observer, observers_, OnBrowserAdded(browser));
-  DCHECK_EQ(original_count, observers_.size())
+  size_t original_count = observers().size();
+  FOR_EACH_OBSERVER(Observer, observers(), OnBrowserAdded(browser));
+  DCHECK_EQ(original_count, observers().size())
       << "observer list modified during notification";
 }
 
@@ -337,30 +349,30 @@ void BrowserList::NotifyAndTerminate(bool fast_path) {
 
 // static
 void BrowserList::RemoveBrowser(Browser* browser) {
-  RemoveBrowserFrom(browser, &last_active_browsers_);
+  RemoveBrowserFrom(browser, &last_active_browsers());
 
   // Closing all windows does not indicate quitting the application on the Mac,
   // however, many UI tests rely on this behavior so leave it be for now and
   // simply ignore the behavior on the Mac outside of unit tests.
   // TODO(andybons): Fix the UI tests to Do The Right Thing.
-  bool closing_last_browser = (browsers_.size() == 1);
+  bool closing_last_browser = (browsers().size() == 1);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(browser),
       content::Details<bool>(&closing_last_browser));
 
-  RemoveBrowserFrom(browser, &browsers_);
+  RemoveBrowserFrom(browser, &browsers());
 
   // Do some basic checking to try to catch evil observers
   // that change the list from under us.
-  size_t original_count = observers_.size();
-  FOR_EACH_OBSERVER(Observer, observers_, OnBrowserRemoved(browser));
-  DCHECK_EQ(original_count, observers_.size())
+  size_t original_count = observers().size();
+  FOR_EACH_OBSERVER(Observer, observers(), OnBrowserRemoved(browser));
+  DCHECK_EQ(original_count, observers().size())
       << "observer list modified during notification";
 
   // If the last Browser object was destroyed, make sure we try to close any
   // remaining dependent windows too.
-  if (browsers_.empty()) {
+  if (browsers().empty()) {
     delete activity_observer;
     activity_observer = NULL;
   }
@@ -369,7 +381,7 @@ void BrowserList::RemoveBrowser(Browser* browser) {
 
   // If we're exiting, send out the APP_TERMINATING notification to allow other
   // modules to shut themselves down.
-  if (browsers_.empty() &&
+  if (browsers().empty() &&
       (browser_shutdown::IsTryingToQuit() ||
        g_browser_process->IsShuttingDown())) {
     // Last browser has just closed, and this is a user-initiated quit or there
@@ -384,12 +396,12 @@ void BrowserList::RemoveBrowser(Browser* browser) {
 
 // static
 void BrowserList::AddObserver(BrowserList::Observer* observer) {
-  observers_.AddObserver(observer);
+  observers().AddObserver(observer);
 }
 
 // static
 void BrowserList::RemoveObserver(BrowserList::Observer* observer) {
-  observers_.RemoveObserver(observer);
+  observers().RemoveObserver(observer);
 }
 
 // static
@@ -406,7 +418,7 @@ void BrowserList::CloseAllBrowsers() {
   // If there are no browsers, send the APP_TERMINATING action here. Otherwise,
   // it will be sent by RemoveBrowser() when the last browser has closed.
   if (browser_shutdown::ShuttingDownWithoutClosingBrowsers() ||
-      browsers_.empty()) {
+      browsers().empty()) {
     NotifyAndTerminate(true);
     return;
   }
@@ -623,7 +635,7 @@ void BrowserList::EndKeepAlive() {
     // If there are no browsers open and we aren't already shutting down,
     // initiate a shutdown. Also skips shutdown if this is a unit test
     // (MessageLoop::current() == null).
-    if (browsers_.empty() && !browser_shutdown::IsTryingToQuit() &&
+    if (browsers().empty() && !browser_shutdown::IsTryingToQuit() &&
         MessageLoop::current())
       CloseAllBrowsers();
   }
@@ -635,7 +647,24 @@ bool BrowserList::WillKeepAlive() {
 }
 
 // static
-BrowserList::BrowserVector BrowserList::last_active_browsers_;
+BrowserList::const_iterator BrowserList::begin() {
+  return browsers().begin();
+}
+
+// static
+BrowserList::const_iterator BrowserList::end() {
+  return browsers().end();
+}
+
+// static
+bool BrowserList::empty() {
+  return browsers().empty();
+}
+
+// static
+size_t BrowserList::size() {
+  return browsers().size();
+}
 
 // static
 void BrowserList::SetLastActive(Browser* browser) {
@@ -644,16 +673,16 @@ void BrowserList::SetLastActive(Browser* browser) {
   // intended depending on the order in which the windows close.
   if (browser_shutdown::IsTryingToQuit())
     return;
-  RemoveBrowserFrom(browser, &last_active_browsers_);
-  last_active_browsers_.push_back(browser);
+  RemoveBrowserFrom(browser, &last_active_browsers());
+  last_active_browsers().push_back(browser);
 
-  FOR_EACH_OBSERVER(Observer, observers_, OnBrowserSetLastActive(browser));
+  FOR_EACH_OBSERVER(Observer, observers(), OnBrowserSetLastActive(browser));
 }
 
 // static
 Browser* BrowserList::GetLastActive() {
-  if (!last_active_browsers_.empty())
-    return *(last_active_browsers_.rbegin());
+  if (!last_active_browsers().empty())
+    return *(last_active_browsers().rbegin());
 
   return NULL;
 }
@@ -728,26 +757,36 @@ Browser* BrowserList::FindBrowserWithTabContents(TabContents* tab_contents) {
 }
 
 // static
-size_t BrowserList::GetBrowserCountForType(Profile* profile,
-                                           bool match_tabbed) {
+BrowserList::const_reverse_iterator BrowserList::begin_last_active() {
+  return last_active_browsers().rbegin();
+}
+
+// static
+BrowserList::const_reverse_iterator BrowserList::end_last_active() {
+  return last_active_browsers().rend();
+}
+
+// static
+size_t BrowserList::GetBrowserCount(Profile* profile) {
   size_t result = 0;
   for (BrowserList::const_iterator i = BrowserList::begin();
        i != BrowserList::end(); ++i) {
-    if (BrowserMatches(*i, profile, Browser::FEATURE_NONE,
-                       match_tabbed ? kMatchTabbed : kMatchAny))
-      ++result;
+    if (BrowserMatches(*i, profile, Browser::FEATURE_NONE, kMatchAny)) {
+      result++;

[Mark Mentovai, 2011/11/16 22:54:24]

For consistency with the preincrement two lines above, use preincrement here
too. (I know this is just moving.)

[Nico, 2011/11/16 22:59:20]

Done.

+    }
   }
   return result;
 }
 
 // static
-size_t BrowserList::GetBrowserCount(Profile* profile) {
+size_t BrowserList::GetBrowserCountForType(Profile* profile,
+                                           bool match_tabbed) {
   size_t result = 0;
   for (BrowserList::const_iterator i = BrowserList::begin();
        i != BrowserList::end(); ++i) {
-    if (BrowserMatches(*i, profile, Browser::FEATURE_NONE, kMatchAny)) {
-      result++;
-    }
+    if (BrowserMatches(*i, profile, Browser::FEATURE_NONE,
+                       match_tabbed ? kMatchTabbed : kMatchAny))
+      ++result;
   }
   return result;
 }