| Index: chrome/browser/ui/browser_finder_chromeos_unittest.cc
|
| diff --git a/chrome/browser/ui/browser_finder_chromeos_unittest.cc b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
|
| index df69f5e7d04f7ff80ac929b0f46d0b3018c437e3..a88c152374c3a4d266619c74a9d414ab431705e4 100644
|
| --- a/chrome/browser/ui/browser_finder_chromeos_unittest.cc
|
| +++ b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
|
| @@ -89,12 +89,9 @@ class BrowserFinderChromeOSTest : public BrowserWithTestWindowTest {
|
|
|
| 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.
|
| @@ -104,12 +101,9 @@ TEST_F(BrowserFinderChromeOSTest, IncognitoBrowserMatchTest) {
|
| chrome::CreateBrowserWithAuraTestWindowForParams(nullptr, ¶ms));
|
| // 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) {
|
| @@ -121,23 +115,17 @@ TEST_F(BrowserFinderChromeOSTest, FindBrowserOwnedByAnotherProfile) {
|
| chrome::CreateBrowserWithAuraTestWindowForParams(nullptr, ¶ms));
|
| 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
|
|
|