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

chrome/browser/browser_commands_unittest.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/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/ui/browser_command_controller.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/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
@@ skipping 48 matching lines @@
   AddTab(browser(), url1);
   NavigateAndCommitActiveTab(url2);
   NavigateAndCommitActiveTab(url3);
   content::NavigationController& orig_controller =
       browser()->tab_strip_model()->GetWebContentsAt(0)->GetController();
   orig_controller.LoadURL(
       url4, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
   EXPECT_EQ(3, orig_controller.GetEntryCount());
   EXPECT_TRUE(orig_controller.GetPendingEntry());
 
-  size_t initial_window_count = BrowserList::size();
+  size_t initial_window_count = chrome::GetTotalBrowserCount();
 
   // Duplicate the tab.
   chrome::ExecuteCommand(browser(), IDC_DUPLICATE_TAB);
 
   // The duplicated tab should not end up in a new window.
-  size_t window_count = BrowserList::size();
+  size_t window_count = chrome::GetTotalBrowserCount();
   ASSERT_EQ(initial_window_count, window_count);
 
   // And we should have a newly duplicated tab.
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
 
   // Verify the stack of urls.
   content::NavigationController& controller =
       browser()->tab_strip_model()->GetWebContentsAt(1)->GetController();
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(2, controller.GetCurrentEntryIndex());
@@ skipping 10 matching lines @@
 
   // Navigate to a URL, plus a pending URL that hasn't committed.
   AddTab(browser(), url1);
   content::NavigationController& orig_controller =
       browser()->tab_strip_model()->GetWebContentsAt(0)->GetController();
   orig_controller.LoadURL(
       url2, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
   EXPECT_EQ(1, orig_controller.GetEntryCount());
   EXPECT_TRUE(orig_controller.GetPendingEntry());
 
-  size_t initial_window_count = BrowserList::size();
+  size_t initial_window_count = chrome::GetTotalBrowserCount();
 
   // View Source.
   chrome::ExecuteCommand(browser(), IDC_VIEW_SOURCE);
 
   // The view source tab should not end up in a new window.
-  size_t window_count = BrowserList::size();
+  size_t window_count = chrome::GetTotalBrowserCount();
   ASSERT_EQ(initial_window_count, window_count);
 
   // And we should have a newly duplicated tab.
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
 
   // Verify we are viewing the source of the last committed entry.
   GURL view_source_url("view-source:http://foo/1");
   content::NavigationController& controller =
       browser()->tab_strip_model()->GetWebContentsAt(1)->GetController();
   EXPECT_EQ(1, controller.GetEntryCount());
@@ skipping 84 matching lines @@
   // Same thing again for forward.
   // TODO(brettw) bug 11055: see the comment above about why we need this.
   CommitPendingLoad(&
       browser()->tab_strip_model()->GetActiveWebContents()->GetController());
   chrome::GoForward(browser(), NEW_FOREGROUND_TAB);
   ASSERT_EQ(4, browser()->tab_strip_model()->active_index());
   ASSERT_EQ(url2,
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }