chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc - Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType

Unified Diff: chrome/browser/ui/tab_contents/tab_contents_iterator_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

« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_sync_starter.cc ('k') | chrome/browser/ui/toolbar/toolbar_model_unittest.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc

diff --git a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc

index 9d36fddb91af4d70793a2408a4a145db740b3127..e03360c7ec7e435ee525b6730393acc227dfef32 100644

--- a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc

+++ b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc

@@ -36,19 +36,17 @@ size_t CountAllTabs() {

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(ui::HOST_DESKTOP_TYPE_NATIVE)->size());

EXPECT_EQ(0U, CountAllTabs());

// Create more browsers/windows.

- Browser::CreateParams native_params(profile(),

- chrome::HOST_DESKTOP_TYPE_NATIVE);

+ Browser::CreateParams native_params(profile(), ui::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);

+ Browser::CreateParams ash_params(profile(), ui::HOST_DESKTOP_TYPE_ASH);

scoped_ptr<Browser> browser3(

chrome::CreateBrowserWithTestWindowForParams(&ash_params));

scoped_ptr<Browser> browser4(

@@ -57,13 +55,10 @@ TEST_F(BrowserListTest, TabContentsIteratorVerifyCount) {

// 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());

+ EXPECT_EQ(4U, BrowserList::GetInstance(ui::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());

+ EXPECT_EQ(2U, BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_NATIVE)->size());

+ EXPECT_EQ(2U, BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH)->size());

#endif

EXPECT_EQ(0, browser()->tab_strip_model()->count());

EXPECT_EQ(0, browser2->tab_strip_model()->count());

@@ -95,30 +90,25 @@ TEST_F(BrowserListTest, TabContentsIteratorVerifyCount) {

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(ui::HOST_DESKTOP_TYPE_NATIVE)->size());

// Create more browsers/windows.

- Browser::CreateParams native_params(profile(),

- chrome::HOST_DESKTOP_TYPE_NATIVE);

+ Browser::CreateParams native_params(profile(), ui::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);

+ Browser::CreateParams ash_params(profile(), ui::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());

+ EXPECT_EQ(3U, BrowserList::GetInstance(ui::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());

+ EXPECT_EQ(2U, BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_NATIVE)->size());

+ EXPECT_EQ(1U, BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH)->size());

#endif

EXPECT_EQ(0, browser()->tab_strip_model()->count());

EXPECT_EQ(0, browser2->tab_strip_model()->count());