Remove the rest of HostDesktopType from c/b/ui/browser_finder.h

chrome/browser/ui/browser_finder_chromeos_unittest.cc

 // Copyright (c) 2015 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/browser_finder.h"
 
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
@@ skipping 71 matching lines @@
 
   TestingProfile* second_profile_;
   scoped_ptr<TestingProfileManager> profile_manager_;
   chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserFinderChromeOSTest);
 };
 
 TEST_F(BrowserFinderChromeOSTest, IncognitoBrowserMatchTest) {
   // GetBrowserCount() use kMatchAll to find all browser windows for profile().
-  EXPECT_EQ(1u,
-            chrome::GetBrowserCount(profile(), chrome::HOST_DESKTOP_TYPE_ASH));
-  EXPECT_TRUE(
-      chrome::FindAnyBrowser(profile(), true, chrome::HOST_DESKTOP_TYPE_ASH));
-  EXPECT_TRUE(
-      chrome::FindAnyBrowser(profile(), false, chrome::HOST_DESKTOP_TYPE_ASH));
+  EXPECT_EQ(1u, chrome::GetBrowserCount(profile()));
+  EXPECT_TRUE(chrome::FindAnyBrowser(profile(), true));
+  EXPECT_TRUE(chrome::FindAnyBrowser(profile(), false));
   set_browser(nullptr);
 
   // Create an incognito browser.
   Browser::CreateParams params(profile()->GetOffTheRecordProfile(),
                                chrome::HOST_DESKTOP_TYPE_ASH);
   scoped_ptr<Browser> incognito_browser(
       chrome::CreateBrowserWithAuraTestWindowForParams(nullptr, &params));
   // Incognito windows are excluded in GetBrowserCount() because kMatchAll
   // doesn't match original profile of the browser with the given profile.
-  EXPECT_EQ(0u,
-            chrome::GetBrowserCount(profile(), chrome::HOST_DESKTOP_TYPE_ASH));
-  EXPECT_TRUE(
-      chrome::FindAnyBrowser(profile(), true, chrome::HOST_DESKTOP_TYPE_ASH));
-  EXPECT_FALSE(
-      chrome::FindAnyBrowser(profile(), false, chrome::HOST_DESKTOP_TYPE_ASH));
+  EXPECT_EQ(0u, chrome::GetBrowserCount(profile()));
+  EXPECT_TRUE(chrome::FindAnyBrowser(profile(), true));
+  EXPECT_FALSE(chrome::FindAnyBrowser(profile(), false));
 }
 
 TEST_F(BrowserFinderChromeOSTest, FindBrowserOwnedByAnotherProfile) {
   set_browser(nullptr);
 
   Browser::CreateParams params(profile()->GetOriginalProfile(),
                                chrome::HOST_DESKTOP_TYPE_ASH);
   scoped_ptr<Browser> browser(
       chrome::CreateBrowserWithAuraTestWindowForParams(nullptr, &params));
   GetUserWindowManager()->SetWindowOwner(browser->window()->GetNativeWindow(),
                                          test_account_id1_);
-  EXPECT_EQ(1u,
-            chrome::GetBrowserCount(profile(), chrome::HOST_DESKTOP_TYPE_ASH));
-  EXPECT_TRUE(
-      chrome::FindAnyBrowser(profile(), true, chrome::HOST_DESKTOP_TYPE_ASH));
-  EXPECT_TRUE(
-      chrome::FindAnyBrowser(profile(), false, chrome::HOST_DESKTOP_TYPE_ASH));
+  EXPECT_EQ(1u, chrome::GetBrowserCount(profile()));
+  EXPECT_TRUE(chrome::FindAnyBrowser(profile(), true));
+  EXPECT_TRUE(chrome::FindAnyBrowser(profile(), false));
 
   // Move the browser window to another user's desktop. Then no window should
   // be available for the current profile.
   GetUserWindowManager()->ShowWindowForUser(
       browser->window()->GetNativeWindow(), test_account_id2_);
-  EXPECT_EQ(0u,
-            chrome::GetBrowserCount(profile(), chrome::HOST_DESKTOP_TYPE_ASH));
-  EXPECT_FALSE(
-      chrome::FindAnyBrowser(profile(), true, chrome::HOST_DESKTOP_TYPE_ASH));
-  EXPECT_FALSE(
-      chrome::FindAnyBrowser(profile(), false, chrome::HOST_DESKTOP_TYPE_ASH));
+  EXPECT_EQ(0u, chrome::GetBrowserCount(profile()));
+  EXPECT_FALSE(chrome::FindAnyBrowser(profile(), true));
+  EXPECT_FALSE(chrome::FindAnyBrowser(profile(), false));
 }
 
 }  // namespace test