Index: chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc |
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc |
index 265784124654659e3b4debbcba3e01cfa06190c6..8399739c2afd8109c084c0ce1d1c86f6c479d483 100644 |
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc |
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc |
@@ -429,28 +429,25 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindows) { |
scoped_ptr<TestingProfile> profile(new TestingProfile()); |
// Creating a popup handler here to make sure it does not interfere with the |
// existing windows. |
- Browser::CreateParams native_params(profile.get(), |
- chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams native_params(profile.get()); |
scoped_ptr<Browser> browser( |
chrome::CreateBrowserWithTestWindowForParams(&native_params)); |
// Creating a popup handler here to make sure it does not interfere with the |
// existing windows. |
- Browser::CreateParams params2(profile.get(), chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams params2(profile.get()); |
scoped_ptr<Browser> browser2(CreateTestBrowser( |
CreateTestWindowInShellWithId(0), gfx::Rect(16, 32, 640, 320), ¶ms2)); |
BrowserWindow* browser_window = browser2->window(); |
// Creating a popup to make sure it does not interfere with the positioning. |
- Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get(), |
- chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get()); |
scoped_ptr<Browser> browser_popup( |
CreateTestBrowser(CreateTestWindowInShellWithId(1), |
gfx::Rect(16, 32, 128, 256), ¶ms_popup)); |
// Creating a panel to make sure it does not interfere with the positioning. |
- Browser::CreateParams params_panel(Browser::TYPE_POPUP, profile.get(), |
- chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams params_panel(Browser::TYPE_POPUP, profile.get()); |
scoped_ptr<Browser> browser_panel( |
CreateTestBrowser(CreateTestWindowInShellWithId(2), |
gfx::Rect(32, 48, 256, 512), ¶ms_panel)); |
@@ -506,8 +503,7 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindows) { |
TEST_F(WindowSizerAshTest, MAYBE_PlaceNewBrowserWindowOnEmptyDesktop) { |
// Create a browser to pass into the GetWindowBoundsAndShowState function. |
scoped_ptr<TestingProfile> profile(new TestingProfile()); |
- Browser::CreateParams native_params(profile.get(), |
- chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams native_params(profile.get()); |
scoped_ptr<Browser> browser( |
chrome::CreateBrowserWithTestWindowForParams(&native_params)); |
@@ -594,7 +590,7 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) { |
scoped_ptr<TestingProfile> profile(new TestingProfile()); |
// Create browser windows that are used as reference. |
- Browser::CreateParams params(profile.get(), chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams params(profile.get()); |
scoped_ptr<Browser> browser(CreateTestBrowser( |
CreateTestWindowInShellWithId(0), gfx::Rect(10, 10, 200, 200), ¶ms)); |
BrowserWindow* browser_window = browser->window(); |
@@ -602,8 +598,7 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) { |
browser_window->Show(); |
EXPECT_EQ(native_window->GetRootWindow(), ash::Shell::GetTargetRootWindow()); |
- Browser::CreateParams another_params(profile.get(), |
- chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams another_params(profile.get()); |
scoped_ptr<Browser> another_browser( |
CreateTestBrowser(CreateTestWindowInShellWithId(1), |
gfx::Rect(400, 10, 300, 300), &another_params)); |
@@ -613,8 +608,7 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) { |
another_browser_window->Show(); |
// Creating a new window to verify the new placement. |
- Browser::CreateParams new_params(profile.get(), |
- chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams new_params(profile.get()); |
scoped_ptr<Browser> new_browser(CreateTestBrowser( |
CreateTestWindowInShellWithId(0), gfx::Rect(), &new_params)); |
@@ -689,14 +683,12 @@ TEST_F(WindowSizerAshTest, MAYBE_TestShowState) { |
scoped_ptr<TestingProfile> profile(new TestingProfile()); |
// Creating a browser & window to play with. |
- Browser::CreateParams params(Browser::TYPE_TABBED, profile.get(), |
- chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams params(Browser::TYPE_TABBED, profile.get()); |
scoped_ptr<Browser> browser(CreateTestBrowser( |
CreateTestWindowInShellWithId(0), gfx::Rect(16, 32, 640, 320), ¶ms)); |
// Create also a popup browser since that behaves different. |
- Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get(), |
- chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get()); |
scoped_ptr<Browser> browser_popup( |
CreateTestBrowser(CreateTestWindowInShellWithId(1), |
gfx::Rect(16, 32, 640, 320), ¶ms_popup)); |
@@ -728,8 +720,7 @@ TEST_F(WindowSizerAshTest, MAYBE_TestShowState) { |
// Now create a top level window and check again for both. Only the tabbed |
// window should follow the top level window's state. |
// Creating a browser & window to play with. |
- Browser::CreateParams params2(Browser::TYPE_TABBED, profile.get(), |
- chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams params2(Browser::TYPE_TABBED, profile.get()); |
scoped_ptr<Browser> browser2(CreateTestBrowser( |
CreateTestWindowInShellWithId(3), gfx::Rect(16, 32, 640, 320), ¶ms2)); |
@@ -765,15 +756,13 @@ TEST_F(WindowSizerAshTest, TestShowStateDefaults) { |
// Creating a browser & window to play with. |
scoped_ptr<TestingProfile> profile(new TestingProfile()); |
- Browser::CreateParams params(Browser::TYPE_TABBED, profile.get(), |
- chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams params(Browser::TYPE_TABBED, profile.get()); |
scoped_ptr<Browser> browser(CreateTestBrowser( |
CreateTestWindowInShellWithId(0), gfx::Rect(16, 32, 640, 320), ¶ms)); |
// Create also a popup browser since that behaves slightly different for |
// defaults. |
- Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get(), |
- chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get()); |
scoped_ptr<Browser> browser_popup( |
CreateTestBrowser(CreateTestWindowInShellWithId(1), |
gfx::Rect(16, 32, 128, 256), ¶ms_popup)); |
@@ -824,8 +813,7 @@ TEST_F(WindowSizerAshTest, TestShowStateDefaults) { |
TEST_F(WindowSizerAshTest, DefaultStateBecomesMaximized) { |
// Create a browser to pass into the GetWindowBounds function. |
scoped_ptr<TestingProfile> profile(new TestingProfile()); |
- Browser::CreateParams native_params(profile.get(), |
- chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams native_params(profile.get()); |
scoped_ptr<Browser> browser( |
chrome::CreateBrowserWithTestWindowForParams(&native_params)); |
@@ -894,8 +882,8 @@ TEST_F(WindowSizerAshTest, DefaultBoundsInTargetDisplay) { |
TEST_F(WindowSizerAshTest, TrustedPopupBehavior) { |
scoped_ptr<TestingProfile> profile(new TestingProfile()); |
- Browser::CreateParams trusted_popup_create_params( |
- Browser::TYPE_POPUP, profile.get(), chrome::HOST_DESKTOP_TYPE_ASH); |
+ Browser::CreateParams trusted_popup_create_params(Browser::TYPE_POPUP, |
+ profile.get()); |
trusted_popup_create_params.trusted_source = true; |
scoped_ptr<Browser> trusted_popup(CreateTestBrowser( |