Make all v1 app windows use the same maximized window frame

chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc

Index: chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc b/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
index b06b048ec9fe8f24d2171dcde7600b1c9cb7c5b1..e217aef7ab2a8884498d4cf485e71db9f01d71fc 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
@@ -101,10 +101,7 @@ IN_PROC_BROWSER_TEST_F(ChromeShellDelegateBrowserTest, ToggleFullscreen) {
   // AppNonClientFrameViewAsh.
   // TODO(pkotwicz): Figure out if we actually want this behavior.
   Browser::CreateParams browser_create_params(Browser::TYPE_POPUP,
-      browser()->profile(), chrome::HOST_DESKTOP_TYPE_NATIVE);
-#if defined(OS_WIN)
-  browser_create_params.host_desktop_type = chrome::HOST_DESKTOP_TYPE_ASH;
-#endif  // OS_WIN
+      browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH);
   browser_create_params.app_name = "Test";
   browser_create_params.app_type = Browser::APP_TYPE_HOST;
 
@@ -123,27 +120,7 @@ IN_PROC_BROWSER_TEST_F(ChromeShellDelegateBrowserTest, ToggleFullscreen) {
   EXPECT_FALSE(browser_window->IsMaximized());
   EXPECT_FALSE(browser_window->IsFullscreen());
 
-  // 4) ToggleFullscreen() should put child windows of v1 apps into
-  // non-immersive fullscreen.
-  browser_create_params.host_desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;
-  browser_create_params.app_type = Browser::APP_TYPE_CHILD;
-  Browser* app_child_browser = new Browser(browser_create_params);
-  ASSERT_TRUE(app_child_browser->is_app());
-  AddBlankTabAndShow(app_child_browser);
-  browser_window = app_child_browser->window();
-  ASSERT_TRUE(browser_window->IsActive());
-  EXPECT_FALSE(browser_window->IsMaximized());
-  EXPECT_FALSE(browser_window->IsFullscreen());
-
-  shell_delegate->ToggleFullscreen();
-  EXPECT_TRUE(browser_window->IsFullscreen());
-  EXPECT_FALSE(IsInImmersiveFullscreen(browser_window));
-
-  shell_delegate->ToggleFullscreen();
-  EXPECT_FALSE(browser_window->IsMaximized());
-  EXPECT_FALSE(browser_window->IsFullscreen());
-
-  // 5) ToggleFullscreen() should put popup browser windows into non-immersive
+  // 4) ToggleFullscreen() should put popup browser windows into non-immersive
   // fullscreen.
   browser_create_params.app_name = "";
   Browser* popup_browser = new Browser(browser_create_params);