Elim Browser::AppType

chrome/browser/ui/ash/accelerator_commands_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_commands.h"
 
 #include "apps/app_window.h"
 #include "apps/ui/native_app_window.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
@@ skipping 167 matching lines @@
   ash::accelerators::ToggleFullscreen();
   EXPECT_TRUE(IsInitialShowState(window_state));
 
   // 2) ToggleFullscreen() should have no effect on windows which cannot be
   // maximized.
   window_state->window()->SetProperty(aura::client::kCanMaximizeKey, false);
   ash::accelerators::ToggleFullscreen();
   EXPECT_TRUE(IsInitialShowState(window_state));
 
   // 3) Hosted apps.
-  Browser::CreateParams browser_create_params(Browser::TYPE_POPUP,
-      browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH);
-  browser_create_params.app_name = "Test";
+  Browser::CreateParams browser_create_params(
+      Browser::CreateParams::CreateForApp(
+          Browser::TYPE_HOSTED_POPUP, "Test", gfx::Rect(),
+          browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH));
 
   Browser* app_host_browser = new Browser(browser_create_params);
   ASSERT_TRUE(app_host_browser->is_app());
   AddBlankTabAndShow(app_host_browser);
   window_state =
       ash::wm::GetWindowState(app_host_browser->window()->GetNativeWindow());
   ASSERT_TRUE(window_state->IsActive());
   SetToInitialShowState(window_state);
   EXPECT_TRUE(IsInitialShowState(window_state));
 
   ash::accelerators::ToggleFullscreen();
   EXPECT_TRUE(window_state->IsFullscreen());
   EXPECT_EQ(put_all_windows_in_immersive(),
             IsInImmersiveFullscreen(window_state));
 
   ash::accelerators::ToggleFullscreen();
   EXPECT_TRUE(IsInitialShowState(window_state));
 
   // 4) Popup browser windows.
-  browser_create_params.app_name = "";
+  browser_create_params = Browser::CreateParams(
+      Browser::TYPE_POPUP, browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH);
   Browser* popup_browser = new Browser(browser_create_params);
   ASSERT_TRUE(popup_browser->is_type_popup());
   ASSERT_FALSE(popup_browser->is_app());
   AddBlankTabAndShow(popup_browser);
   window_state =
       ash::wm::GetWindowState(popup_browser->window()->GetNativeWindow());
   ASSERT_TRUE(window_state->IsActive());
   SetToInitialShowState(window_state);
   EXPECT_TRUE(IsInitialShowState(window_state));
 
@@ skipping 182 matching lines @@
 // cycles.
 INSTANTIATE_TEST_CASE_P(InitiallyRestored,
                         AcceleratorCommandsPlatformAppFullscreenBrowserTest,
                         Combine(Values(false),
                                 Values(ui::SHOW_STATE_NORMAL)));
 INSTANTIATE_TEST_CASE_P(InitiallyMaximized,
                         AcceleratorCommandsPlatformAppFullscreenBrowserTest,
                         Combine(Values(false),
                                 Values(ui::SHOW_STATE_MAXIMIZED)));
 #endif