Remove HostDesktopType from BrowserList::GetInstance()

chrome/browser/ui/tab_contents/tab_contents_iterator_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/tab_contents/tab_contents_iterator.h"
 
 #include <stddef.h>
 
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
@@ skipping 21 matching lines @@
   size_t count = 0;
   for (TabContentsIterator iterator; !iterator.done(); iterator.Next())
     ++count;
   return count;
 }
 
 }  // namespace
 
 TEST_F(BrowserListTest, TabContentsIteratorVerifyCount) {
   // Make sure we have 1 window to start with.
-  EXPECT_EQ(1U,
-            BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->size());
+  EXPECT_EQ(1U, BrowserList::GetInstance()->size());
 
   EXPECT_EQ(0U, CountAllTabs());
 
   // Create more browsers/windows.
   Browser::CreateParams native_params(profile(),
                                       chrome::HOST_DESKTOP_TYPE_NATIVE);
   scoped_ptr<Browser> browser2(
       chrome::CreateBrowserWithTestWindowForParams(&native_params));
   // Create browser 3 and 4 on the Ash desktop (the TabContentsIterator
   // shouldn't see the difference).
   Browser::CreateParams ash_params(profile(), chrome::HOST_DESKTOP_TYPE_ASH);
   scoped_ptr<Browser> browser3(
       chrome::CreateBrowserWithTestWindowForParams(&ash_params));
   scoped_ptr<Browser> browser4(
       chrome::CreateBrowserWithTestWindowForParams(&ash_params));
 
   // Sanity checks.
-#if defined(OS_CHROMEOS)
-  // The ash desktop is the native desktop on Chrome OS.
-  EXPECT_EQ(4U,
-            BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->size());
-#else
-  EXPECT_EQ(2U,
-            BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->size());
-  EXPECT_EQ(2U,
-            BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH)->size());
-#endif
+  EXPECT_EQ(4U, BrowserList::GetInstance()->size());
   EXPECT_EQ(0, browser()->tab_strip_model()->count());
   EXPECT_EQ(0, browser2->tab_strip_model()->count());
   EXPECT_EQ(0, browser3->tab_strip_model()->count());
   EXPECT_EQ(0, browser4->tab_strip_model()->count());
 
   EXPECT_EQ(0U, CountAllTabs());
 
   // Add some tabs.
   for (size_t i = 0; i < 3; ++i)
     chrome::NewTab(browser2.get());
@@ skipping 10 matching lines @@
   for (size_t i = 0; i < 41; ++i)
     chrome::NewTab(browser());
 
   EXPECT_EQ(42U, CountAllTabs());
   // Close all remaining tabs to keep all the destructors happy.
   browser3->tab_strip_model()->CloseAllTabs();
 }
 
 TEST_F(BrowserListTest, TabContentsIteratorVerifyBrowser) {
   // Make sure we have 1 window to start with.
-  EXPECT_EQ(1U,
-            BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->size());
+  EXPECT_EQ(1U, BrowserList::GetInstance()->size());
 
   // Create more browsers/windows.
   Browser::CreateParams native_params(profile(),
                                       chrome::HOST_DESKTOP_TYPE_NATIVE);
   scoped_ptr<Browser> browser2(
       chrome::CreateBrowserWithTestWindowForParams(&native_params));
   // Create browser 3 on the Ash desktop (the TabContentsIterator shouldn't see
   // the difference).
   Browser::CreateParams ash_params(profile(), chrome::HOST_DESKTOP_TYPE_ASH);
   scoped_ptr<Browser> browser3(
       chrome::CreateBrowserWithTestWindowForParams(&ash_params));
 
   // Sanity checks.
-#if defined(OS_CHROMEOS)
-  // The ash desktop is the native desktop on Chrome OS.
-  EXPECT_EQ(3U,
-            BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->size());
-#else
-  EXPECT_EQ(2U,
-            BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->size());
-  EXPECT_EQ(1U,
-            BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH)->size());
-#endif
+  EXPECT_EQ(3U, BrowserList::GetInstance()->size());
   EXPECT_EQ(0, browser()->tab_strip_model()->count());
   EXPECT_EQ(0, browser2->tab_strip_model()->count());
   EXPECT_EQ(0, browser3->tab_strip_model()->count());
 
   EXPECT_EQ(0U, CountAllTabs());
 
   // Add some tabs.
   for (size_t i = 0; i < 3; ++i)
     chrome::NewTab(browser2.get());
   for (size_t i = 0; i < 2; ++i)
@@ skipping 71 matching lines @@
   testing_browser_process->SetProfileManager(profile_manager);
 
   chrome::AttemptRestart();
   // Cancel the effects of us calling chrome::AttemptRestart. Otherwise tests
   // ran after this one will fail.
   browser_shutdown::SetTryingToQuit(false);
 
   EXPECT_TRUE(testing_pref_service.GetBoolean(prefs::kWasRestarted));
   testing_browser_process->SetLocalState(NULL);
 }