[Docking] Restores docked state for tab-less browser windows

chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc

 // Copyright (c) 2015 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 "chrome/browser/ui/views/frame/browser_view.h"
 
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/views/focus/focus_manager.h"
@@ skipping 46 matching lines @@
 // remembered for tabbed browser windows.
 IN_PROC_BROWSER_TEST_P(BrowserViewTestParam, BrowserRemembersDockedState) {
   // Open a new browser window (app or tabbed depending on a parameter).
   bool test_app = TestApp();
   Browser::CreateParams params =
       test_app ? Browser::CreateParams::CreateForApp(
                      "test_browser_app", true /* trusted_source */, gfx::Rect(),
                      browser()->profile(), browser()->host_desktop_type())
                : Browser::CreateParams(browser()->profile(),
                                        browser()->host_desktop_type());
-  params.initial_show_state = ui::SHOW_STATE_NORMAL;
+  params.initial_show_state = ui::SHOW_STATE_DEFAULT;
   bool is_ash = browser()->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH;
   // Default |browser()| is not used by this test.
   browser()->window()->Close();
 
   // Create a new app browser
   Browser* browser = new Browser(params);
   ASSERT_TRUE(browser);
   gfx::NativeWindow window = browser->window()->GetNativeWindow();
   gfx::Rect original_bounds(gfx::Rect(150, 250, 350, 100));
   window->SetBounds(original_bounds);
   window->Show();
   // Dock the browser window using |kShowStateKey| property.
   gfx::Rect work_area = gfx::Screen::GetScreenFor(window)
                             ->GetDisplayNearestPoint(window->bounds().origin())
                             .work_area();
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_DOCKED);
 
   // Saved placement should reflect docked state (for app windows only in Ash).
   gfx::Rect bounds;
-  ui::WindowShowState show_state = ui::SHOW_STATE_NORMAL;
+  ui::WindowShowState show_state = ui::SHOW_STATE_DEFAULT;
   const views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
   widget->widget_delegate()->GetSavedWindowPlacement(widget, &bounds,
                                                      &show_state);
-  EXPECT_EQ(is_ash && test_app ? ui::SHOW_STATE_DOCKED : ui::SHOW_STATE_NORMAL,
+  EXPECT_EQ(is_ash && test_app ? ui::SHOW_STATE_DOCKED : ui::SHOW_STATE_DEFAULT,
             show_state);
   // Docking is only relevant on Ash desktop.
   if (!is_ash)
     return;
 
   // Saved placement should reflect restore bounds.
   ASSERT_NE(nullptr, window->GetProperty(aura::client::kRestoreBoundsKey));
   original_bounds = *window->GetProperty(aura::client::kRestoreBoundsKey);
   gfx::Rect expected_bounds = work_area;
   expected_bounds.ClampToCenteredSize(original_bounds.size());
@@ skipping 45 matching lines @@
   window = browser->window()->GetNativeWindow();
   EXPECT_EQ(expected_bounds.ToString(), window->GetTargetBounds().ToString());
   EXPECT_EQ(ui::SHOW_STATE_NORMAL,
             window->GetProperty(aura::client::kShowStateKey));
 }
 
 INSTANTIATE_TEST_CASE_P(BrowserViewTestTabbedOrApp,
                         BrowserViewTestParam,
                         testing::Bool());
 #endif