Replace most BrowserList::empty() and BrowserList::size() calls by multi-desktop aware calls.

Replace most BrowserList::empty() and BrowserList::size() calls by multi-desktop aware calls.

Introducing chrome::GetTotalBrowserCount() in browser_finder.cc which counts browsers across all desktops and profiles (this is the desired count for most BrowserList::empty() and BrowserList::size() consumers).

Otherwise calling a specific BrowserListImpl's size() when appropriate.

BUG=129187
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=182178

[gab, 2013-02-11 22:20:30]

Scott, please take a look.

The new method is at
https://codereview.chromium.org/12212120/diff/1/chrome/browser/ui/browser_fin...
; the rest of this CL is otherwise simply getting rid of a lot of
native-desktop-only BrowserList::size() and BrowserList::empty() calls.

Thanks!
Gab

[sky, 2013-02-12 00:44:52]

LGTM

https://codereview.chromium.org/12212120/diff/1/chrome/browser/ui/cocoa/apple...
File chrome/browser/ui/cocoa/applescript/window_applescript.mm (right):

https://codereview.chromium.org/12212120/diff/1/chrome/browser/ui/cocoa/apple...
chrome/browser/ui/cocoa/applescript/window_applescript.mm:215: if (index < 0 ||
index >= (int)chrome::GetTotalBrowserCount())) {
static_cast (I think for .mm files too)

[gab, 2013-02-12 03:53:51]

Thanks!

https://codereview.chromium.org/12212120/diff/1/chrome/browser/ui/cocoa/apple...
File chrome/browser/ui/cocoa/applescript/window_applescript.mm (right):

https://codereview.chromium.org/12212120/diff/1/chrome/browser/ui/cocoa/apple...
chrome/browser/ui/cocoa/applescript/window_applescript.mm:215: if (index < 0 ||
index >= (int)chrome::GetTotalBrowserCount())) {
On 2013/02/12 00:44:52, sky wrote:
> static_cast (I think for .mm files too)

Done.

[commit-bot: I haz the power, 2013-02-12 03:56:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/12212120/7002

[commit-bot: I haz the power, 2013-02-12 03:56:26]

Failed to apply patch for chrome/browser/app_controller_mac.mm:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/app_controller_mac.mm
  Hunk #1 FAILED at 42.
  Hunk #2 succeeded at 302 (offset -1 lines).
  Hunk #3 succeeded at 351 (offset -1 lines).
  Hunk #4 succeeded at 485 (offset -1 lines).
  1 out of 4 hunks FAILED -- saving rejects to file
chrome/browser/app_controller_mac.mm.rej

Patch:       chrome/browser/app_controller_mac.mm
Index: chrome/browser/app_controller_mac.mm
diff --git a/chrome/browser/app_controller_mac.mm
b/chrome/browser/app_controller_mac.mm
index
037c125d4302ae0c3bcc629a3ae723950268b266..a6425a0cad4db3484b12118b9000e647c4b037c4
100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -42,7 +42,6 @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_iterator.h"
-#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_mac.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
@@ -303,7 +302,7 @@ void RecordLastRunAppBundlePath() {
       [self applicationShouldTerminate:app] != NSTerminateNow)
     return NO;
 
-  size_t num_browsers = BrowserList::size();
+  size_t num_browsers = chrome::GetTotalBrowserCount();
 
   // Initiate a shutdown (via browser::CloseAllBrowsers()) if we aren't
   // already shutting down.
@@ -352,7 +351,7 @@ void RecordLastRunAppBundlePath() {
 // Called when the app is shutting down. Clean-up as appropriate.
 - (void)applicationWillTerminate:(NSNotification*)aNotification {
   // There better be no browser windows left at this point.
-  CHECK_EQ(0u, BrowserList::size());
+  CHECK_EQ(0u, chrome::GetTotalBrowserCount());
 
   // Tell BrowserList not to keep the browser process alive. Once all the
   // browsers get dealloc'd, it will stop the RunLoop and fall back into
main().
@@ -486,7 +485,7 @@ void RecordLastRunAppBundlePath() {
     // If the profile is incognito, use the original profile.
     Profile* newProfile = [windowController profile]->GetOriginalProfile();
     [self windowChangedToProfile:newProfile];
-  } else if (BrowserList::empty()) {
+  } else if (chrome::GetTotalBrowserCount() == 0) {
     [self windowChangedToProfile:
         g_browser_process->profile_manager()->GetLastUsedProfile()];
   }

[commit-bot: I haz the power, 2013-02-12 12:51:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/12212120/7002

[commit-bot: I haz the power, 2013-02-12 13:17:41]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_aura.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-02-12 16:58:43]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/12212120/20003

[commit-bot: I haz the power, 2013-02-12 17:38:54]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_rel&...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-02-12 20:42:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/12212120/20003

[commit-bot: I haz the power, 2013-02-13 02:08:05]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win7_aura.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win7_aura&...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-02-13 03:32:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/12212120/20003

[commit-bot: I haz the power, 2013-02-13 03:32:31]

Failed to apply patch for
chrome/browser/printing/print_preview_dialog_controller_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/printing/print_preview_dialog_controller_unittest.cc
  Hunk #2 succeeded at 35 with fuzz 2 (offset 2 lines).
  Hunk #3 FAILED at 72.
  Hunk #4 succeeded at 138 with fuzz 1 (offset 9 lines).
  1 out of 4 hunks FAILED -- saving rejects to file
chrome/browser/printing/print_preview_dialog_controller_unittest.cc.rej

Patch:       chrome/browser/printing/print_preview_dialog_controller_unittest.cc
Index: chrome/browser/printing/print_preview_dialog_controller_unittest.cc
diff --git a/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
b/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
index
54c7946f8dd4ba50459bc2902a6aa43f67c56001..1525efdd6a47a984b93abfe9ed920177671242cb
100644
--- a/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
@@ -6,7 +6,7 @@
 #include "chrome/browser/printing/print_preview_test.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/ui/browser_commands.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
 #include "content/public/browser/navigation_details.h"
@@ -33,7 +33,7 @@ typedef PrintPreviewTest PrintPreviewDialogControllerUnitTest;
 // Create/Get a preview tab for initiator tab.
 TEST_F(PrintPreviewDialogControllerUnitTest, MAYBE_GetOrCreatePreviewTab) {
   // Lets start with one window with one tab.
-  EXPECT_EQ(1u, BrowserList::size());
+  EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
   EXPECT_EQ(0, browser()->tab_strip_model()->count());
   chrome::NewTab(browser());
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
@@ -72,7 +72,7 @@ TEST_F(PrintPreviewDialogControllerUnitTest,
MAYBE_GetOrCreatePreviewTab) {
 // gets focused.
 TEST_F(PrintPreviewDialogControllerUnitTest, MAYBE_MultiplePreviewTabs) {
   // Lets start with one window and two tabs.
-  EXPECT_EQ(1u, BrowserList::size());
+  EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
   TabStripModel* model = browser()->tab_strip_model();
   ASSERT_TRUE(model);
 
@@ -129,7 +129,7 @@ TEST_F(PrintPreviewDialogControllerUnitTest,
MAYBE_MultiplePreviewTabs) {
 // Clear the initiator tab details associated with preview tab.
 TEST_F(PrintPreviewDialogControllerUnitTest, MAYBE_ClearInitiatorTabDetails) {
   // Lets start with one window with one tab.
-  EXPECT_EQ(1u, BrowserList::size());
+  EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
   EXPECT_EQ(0, browser()->tab_strip_model()->count());
   chrome::NewTab(browser());
   EXPECT_EQ(1, browser()->tab_strip_model()->count());

[commit-bot: I haz the power, 2013-02-13 03:56:35]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/12212120/2023

[commit-bot: I haz the power, 2013-02-13 09:53:21]

Change committed as 182178