ash: Do not constrain window bounds if requested

ash/wm/window_state_unittest.cc

 // Copyright 2014 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/wm/window_state.h"
 
 #include <utility>
 
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
@@ skipping 357 matching lines @@
 
   // Update display triggers workspace event.
   UpdateDisplay("300x200");
   EXPECT_EQ("0,0 300x200", window->GetBoundsInScreen().ToString());
 
   // Unpin should work.
   window_state->Restore();
   EXPECT_FALSE(window_state->IsTrustedPinned());
 }
 
-TEST_F(WindowStateTest, AllowSetBoundsInMaximized) {
+TEST_F(WindowStateTest, AllowSetBoundsDirect) {
   std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
   WindowState* window_state = GetWindowState(window.get());
   EXPECT_FALSE(window_state->IsMaximized());
   gfx::Rect work_area =
       display::Screen::GetScreen()->GetPrimaryDisplay().work_area();
   gfx::Rect original_bounds(50, 50, 200, 200);
   window->SetBounds(original_bounds);
   ASSERT_EQ(original_bounds, window->bounds());
 
-  window_state->set_allow_set_bounds_in_maximized(true);
+  window_state->set_allow_set_bounds_direct(true);
   window_state->Maximize();
 
   EXPECT_TRUE(window_state->IsMaximized());
   EXPECT_EQ(work_area, window->bounds());
 
   gfx::Rect new_bounds(10, 10, 300, 300);
   window->SetBounds(new_bounds);
   EXPECT_EQ(new_bounds, window->bounds());
 
   window_state->Restore();
   EXPECT_FALSE(window_state->IsMaximized());
   EXPECT_EQ(original_bounds, window->bounds());
 
-  window_state->set_allow_set_bounds_in_maximized(false);
+  window_state->set_allow_set_bounds_direct(false);
   window_state->Maximize();
 
   EXPECT_TRUE(window_state->IsMaximized());
   EXPECT_EQ(work_area, window->bounds());
   window->SetBounds(new_bounds);
   EXPECT_EQ(work_area, window->bounds());
 }
 
 TEST_F(WindowStateTest, FullscreenMinimizedSwitching) {
   std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
@@ skipping 43 matching lines @@
   // return to the state before minimizing and fullscreen.
   ash::wm::ToggleFullScreen(window_state, nullptr);
   ASSERT_TRUE(window_state->IsMaximized());
 }
 
 // TODO(skuhne): Add more unit test to verify the correctness for the restore
 // operation.
 
 }  // namespace wm
 }  // namespace ash