Simplify WorkAreaBounds access logic

ash/wm/workspace/workspace_window_resizer_unittest.cc

 // Copyright (c) 2012 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/workspace/workspace_window_resizer.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ skipping 921 matching lines @@
   resizer->CompleteDrag(ui::EF_CONTROL_DOWN);
   EXPECT_EQ("106,124 320x160", window_->bounds().ToString());
 }
 
 // Check that only usable sizes get returned by the resizer.
 TEST_F(WorkspaceWindowResizerTest, TestProperSizerResolutions) {
   window_->SetBounds(gfx::Rect(96, 112, 320, 160));
   scoped_ptr<SnapSizer> resizer(new SnapSizer(
       window_.get(), gfx::Point(), SnapSizer::LEFT_EDGE));
   ASSERT_TRUE(resizer.get());
+  Shell::GetInstance()->shelf()->SetAutoHideBehavior(
+      SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   gfx::Rect rect = resizer->GetTargetBoundsForSize(0);
   EXPECT_EQ("0,0 720x552", rect.ToString());
   rect = resizer->GetTargetBoundsForSize(1);
   EXPECT_EQ("0,0 720x552", rect.ToString());
   rect = resizer->GetTargetBoundsForSize(2);
   EXPECT_EQ("0,0 720x552", rect.ToString());
   rect = resizer->GetTargetBoundsForSize(3);
   EXPECT_EQ("0,0 640x552", rect.ToString());
+  Shell::GetInstance()->shelf()->SetAutoHideBehavior(
+      SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
+  rect = resizer->GetTargetBoundsForSize(0);
+  EXPECT_EQ("0,0 720x597", rect.ToString());
+  rect = resizer->GetTargetBoundsForSize(1);
+  EXPECT_EQ("0,0 720x597", rect.ToString());
+  rect = resizer->GetTargetBoundsForSize(2);
+  EXPECT_EQ("0,0 720x597", rect.ToString());
+  rect = resizer->GetTargetBoundsForSize(3);
+  EXPECT_EQ("0,0 640x597", rect.ToString());
 }
 
 // Verifies that a dragged window will restore to its pre-maximized size.
 TEST_F(WorkspaceWindowResizerTest, RestoreToPreMaximizeCoordinates) {
   window_->SetBounds(gfx::Rect(0, 0, 1000, 1000));
   SetRestoreBoundsInScreen(window_.get(), gfx::Rect(96, 112, 320, 160));
   scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
       window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
   ASSERT_TRUE(resizer.get());
   // Drag the window to new position by adding (10, 10) to original point,
@@ skipping 42 matching lines @@
   resizer->Drag(CalculateDragPoint(*resizer, 142, 119), 0);
   EXPECT_EQ("152,130 20x30", window_->bounds().ToString());
 
   // Move |window| one pixel above the bottom of |window2|.
   resizer->Drag(CalculateDragPoint(*resizer, 142, 169), 0);
   EXPECT_EQ("152,180 20x30", window_->bounds().ToString());
 }
 
 }  // namespace internal
 }  // namespace ash