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

chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_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/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "ash/launcher/launcher_model.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/menu_model.h"
@@ skipping 269 matching lines @@
   EXPECT_EQ(expected_menu_items, menu->GetItemCount());
   EXPECT_FALSE(menu->IsEnabledAt(first_item));
   if (expected_items) {
     EXPECT_EQ(ui::MenuModel::TYPE_SEPARATOR,
               menu->GetTypeAt(first_item + 1));
   }
 }
 
 // Check that browsers get reflected correctly in the launcher menu.
 TEST_F(ChromeLauncherControllerPerAppTest, BrowserMenuGeneration) {
-  EXPECT_EQ(1U, BrowserList::size());
+  EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
   chrome::NewTab(browser());
 
   ChromeLauncherControllerPerApp launcher_controller(profile(), &model_);
   launcher_controller.Init();
 
   // Check that the browser list is empty at this time.
   ash::LauncherItem item_browser;
   item_browser.type = ash::TYPE_BROWSER_SHORTCUT;
   CheckMenuCreation(&launcher_controller, item_browser, 0, NULL);
 
@@ skipping 21 matching lines @@
 
   // Apparently we have to close all tabs we have.
   chrome::CloseTab(browser2.get());
 }
 
 // Check that V1 apps are correctly reflected in the launcher menu using the
 // refocus logic.
 // Note that the extension matching logic is tested by the extension system
 // and does not need a separate test here.
 TEST_F(ChromeLauncherControllerPerAppTest, V1AppMenuGeneration) {
-  EXPECT_EQ(1U, BrowserList::size());
+  EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
   EXPECT_EQ(0, browser()->tab_strip_model()->count());
   chrome::NewTab(browser());
   BrowserList::SetLastActive(browser());
 
   ChromeLauncherControllerPerApp launcher_controller(profile(), &model_);
   launcher_controller.Init();
 
   // Model should only contain the browser shortcut and app list items.
   EXPECT_EQ(2, model_.item_count());
   EXPECT_FALSE(launcher_controller.IsAppPinned(extension3_->id()));
@@ skipping 99 matching lines @@
     int first_item =
         (menu->GetTypeAt(0) == ui::MenuModel::TYPE_SEPARATOR) ? 1 : 0;
     menu->ActivatedAt(first_item + 3);
   }
   // Now the active tab should be the second item.
   EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
 }
 
 // TODO(skuhne) Add tests for:
 //   - V2 apps: create through item in launcher or directly