Simplify WorkAreaBounds access logic

ash/wm/shelf_layout_manager_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/shelf_layout_manager.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/focus_cycler.h"
@@ skipping 400 matching lines @@
   Shell::GetInstance()->delegate()->LockScreen();
   shelf->UpdateVisibilityState();
   // Showing a widget in the lock screen should force the shelf to be visibile.
   EXPECT_EQ(ShelfLayoutManager::VISIBLE, shelf->visibility_state());
 
   Shell::GetInstance()->delegate()->UnlockScreen();
   shelf->UpdateVisibilityState();
   EXPECT_EQ(ShelfLayoutManager::AUTO_HIDE, shelf->visibility_state());
 }
 
-// Assertions around SetAutoHideBehavior.
-TEST_F(ShelfLayoutManagerTest, SetAutoHideBehavior) {
-  // Since ShelfLayoutManager queries for mouse location, move the mouse so
-  // it isn't over the shelf.
-  aura::test::EventGenerator generator(
-      Shell::GetPrimaryRootWindow(), gfx::Point());
-  generator.MoveMouseTo(0, 0);
-
-  ShelfLayoutManager* shelf = GetShelfLayoutManager();
-  views::Widget* widget = new views::Widget;
-  views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
-  params.bounds = gfx::Rect(0, 0, 200, 200);
-  // Widget is now owned by the parent window.
-  widget->Init(params);
-  widget->Show();
-  aura::Window* window = widget->GetNativeWindow();
-  gfx::Rect display_bounds(
-      gfx::Screen::GetDisplayNearestWindow(window).bounds());
-
-  shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
-  EXPECT_EQ(ShelfLayoutManager::AUTO_HIDE, shelf->visibility_state());
-  EXPECT_EQ(display_bounds.bottom() - ShelfLayoutManager::kAutoHideSize,
-            shelf->GetMaximizedWindowBounds(window).bottom());
-
-  shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
-  EXPECT_EQ(ShelfLayoutManager::VISIBLE, shelf->visibility_state());
-  EXPECT_GT(display_bounds.bottom() - ShelfLayoutManager::kAutoHideSize,
-            shelf->GetMaximizedWindowBounds(window).bottom());
-
-  widget->Maximize();
-  EXPECT_EQ(ShelfLayoutManager::VISIBLE, shelf->visibility_state());
-  EXPECT_EQ(gfx::Screen::GetDisplayNearestWindow(window).work_area().bottom(),
-            widget->GetWorkAreaBoundsInScreen().bottom());
-
-  shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
-  EXPECT_EQ(ShelfLayoutManager::AUTO_HIDE, shelf->visibility_state());
-  EXPECT_EQ(gfx::Screen::GetDisplayNearestWindow(window).work_area().bottom(),
-            widget->GetWorkAreaBoundsInScreen().bottom());
-
-  shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
-  EXPECT_EQ(ShelfLayoutManager::VISIBLE, shelf->visibility_state());
-  EXPECT_EQ(gfx::Screen::GetDisplayNearestWindow(window).work_area().bottom(),
-            widget->GetWorkAreaBoundsInScreen().bottom());
-}
-
 // Verifies the shelf is visible when status/launcher is focused.
 TEST_F(ShelfLayoutManagerTest, VisibleWhenStatusOrLauncherFocused) {
   // Since ShelfLayoutManager queries for mouse location, move the mouse so
   // it isn't over the shelf.
   aura::test::EventGenerator generator(
       Shell::GetPrimaryRootWindow(), gfx::Point());
   generator.MoveMouseTo(0, 0);
 
   ShelfLayoutManager* shelf = GetShelfLayoutManager();
   views::Widget* widget = new views::Widget;
@@ skipping 473 matching lines @@
       EXPECT_TRUE(status_area->IsMessageBubbleShown());
     } else {
       EXPECT_FALSE(shelf->IsVisible());
       EXPECT_FALSE(status_area->IsMessageBubbleShown());
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash