Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7789)

Unified Diff: chrome/browser/ui/browser_finder_chromeos_unittest.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 73018399bb35b4b1f859560f696fde3357c1f8f6..fccbaae9749fbb577c1bfd8aa06e8a8ca0c37ecb 100644
--- a/chrome/browser/ui/browser_finder_chromeos_unittest.cc
+++ b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
@@ -82,55 +82,51 @@ 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_EQ(1u, chrome::GetBrowserCount(profile(), ui::HOST_DESKTOP_TYPE_ASH));
EXPECT_TRUE(
- chrome::FindAnyBrowser(profile(), true, chrome::HOST_DESKTOP_TYPE_ASH));
+ chrome::FindAnyBrowser(profile(), true, ui::HOST_DESKTOP_TYPE_ASH));
EXPECT_TRUE(
- chrome::FindAnyBrowser(profile(), false, chrome::HOST_DESKTOP_TYPE_ASH));
+ chrome::FindAnyBrowser(profile(), false, ui::HOST_DESKTOP_TYPE_ASH));
set_browser(nullptr);
// Create an incognito browser.
Browser::CreateParams params(profile()->GetOffTheRecordProfile(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ ui::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_EQ(0u, chrome::GetBrowserCount(profile(), ui::HOST_DESKTOP_TYPE_ASH));
EXPECT_TRUE(
- chrome::FindAnyBrowser(profile(), true, chrome::HOST_DESKTOP_TYPE_ASH));
+ chrome::FindAnyBrowser(profile(), true, ui::HOST_DESKTOP_TYPE_ASH));
EXPECT_FALSE(
- chrome::FindAnyBrowser(profile(), false, chrome::HOST_DESKTOP_TYPE_ASH));
+ chrome::FindAnyBrowser(profile(), false, ui::HOST_DESKTOP_TYPE_ASH));
}
TEST_F(BrowserFinderChromeOSTest, FindBrowserOwnedByAnotherProfile) {
set_browser(nullptr);
Browser::CreateParams params(profile()->GetOriginalProfile(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> browser(
chrome::CreateBrowserWithAuraTestWindowForParams(nullptr, &params));
GetUserWindowManager()->SetWindowOwner(browser->window()->GetNativeWindow(),
kTestAccount1);
- EXPECT_EQ(1u,
- chrome::GetBrowserCount(profile(), chrome::HOST_DESKTOP_TYPE_ASH));
+ EXPECT_EQ(1u, chrome::GetBrowserCount(profile(), ui::HOST_DESKTOP_TYPE_ASH));
EXPECT_TRUE(
- chrome::FindAnyBrowser(profile(), true, chrome::HOST_DESKTOP_TYPE_ASH));
+ chrome::FindAnyBrowser(profile(), true, ui::HOST_DESKTOP_TYPE_ASH));
EXPECT_TRUE(
- chrome::FindAnyBrowser(profile(), false, chrome::HOST_DESKTOP_TYPE_ASH));
+ chrome::FindAnyBrowser(profile(), false, ui::HOST_DESKTOP_TYPE_ASH));
// Move the browser window to another user's desktop. Then no window should
// be available for the current profile.
GetUserWindowManager()->ShowWindowForUser(
browser->window()->GetNativeWindow(), kTestAccount2);
- EXPECT_EQ(0u,
- chrome::GetBrowserCount(profile(), chrome::HOST_DESKTOP_TYPE_ASH));
+ EXPECT_EQ(0u, chrome::GetBrowserCount(profile(), ui::HOST_DESKTOP_TYPE_ASH));
EXPECT_FALSE(
- chrome::FindAnyBrowser(profile(), true, chrome::HOST_DESKTOP_TYPE_ASH));
+ chrome::FindAnyBrowser(profile(), true, ui::HOST_DESKTOP_TYPE_ASH));
EXPECT_FALSE(
- chrome::FindAnyBrowser(profile(), false, chrome::HOST_DESKTOP_TYPE_ASH));
+ chrome::FindAnyBrowser(profile(), false, ui::HOST_DESKTOP_TYPE_ASH));
}
} // namespace test

Powered by Google App Engine
This is Rietveld 408576698