Swap BrowserList::const_iterator for the multi-desktop aware BrowserIterator in many scenarios.

chrome/browser/ui/uma_browsing_activity_observer.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/ui/uma_browsing_activity_observer.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 
 namespace chrome {
 namespace {
@@ skipping 46 matching lines @@
   UMA_HISTOGRAM_CUSTOM_COUNTS("MPArch.RPHCountPerLoad", hosts_count,
                               1, 50, 50);
 }
 
 void UMABrowsingActivityObserver::LogBrowserTabCount() const {
   int tab_count = 0;
   int app_window_count = 0;
   int panel_window_count = 0;
   int popup_window_count = 0;
   int tabbed_window_count = 0;
-  for (BrowserList::const_iterator browser_iterator = BrowserList::begin();
-       browser_iterator != BrowserList::end(); ++browser_iterator) {
+  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     // Record how many tabs each window has open.
-    Browser* browser = (*browser_iterator);
+    Browser* browser = *it;
     UMA_HISTOGRAM_CUSTOM_COUNTS("Tabs.TabCountPerWindow",
                                 browser->tab_strip_model()->count(),
                                 1, 200, 50);
     tab_count += browser->tab_strip_model()->count();
 
     if (browser->window()->IsActive()) {
       // Record how many tabs the active window has open.
       UMA_HISTOGRAM_CUSTOM_COUNTS("Tabs.TabCountActiveWindow",
                                   browser->tab_strip_model()->count(),
                                   1, 200, 50);
@@ skipping 16 matching lines @@
                            app_window_count);
   UMA_HISTOGRAM_COUNTS_100("WindowManager.PanelWindowCountPerLoad",
                            panel_window_count);
   UMA_HISTOGRAM_COUNTS_100("WindowManager.PopUpWindowCountPerLoad",
                            popup_window_count);
   UMA_HISTOGRAM_COUNTS_100("WindowManager.TabbedWindowCountPerLoad",
                            tabbed_window_count);
 }
 
 }  // namespace chrome