Autohide behavior simplified to always/never

ash/screen_ash_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/screen_ash.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 namespace test {
 
 typedef test::AshTestBase ScreenAshTest;
 
 #if !defined(OS_WIN)
 TEST_F(ScreenAshTest, Bounds) {
   UpdateDisplay("600x600,500x500");
+  Shell::GetInstance()->SetShelfAutoHideBehavior(
+      ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
 
   views::Widget* primary =
       views::Widget::CreateWindowWithBounds(NULL, gfx::Rect(10, 10, 100, 100));
   primary->Show();
   views::Widget* secondary =
       views::Widget::CreateWindowWithBounds(NULL, gfx::Rect(610, 10, 100, 100));
   secondary->Show();
 
   // Maximized bounds
   EXPECT_EQ("0,0 600x597",
             ScreenAsh::GetMaximizedWindowBoundsInParent(
                 primary->GetNativeView()).ToString());
   EXPECT_EQ("0,0 500x500",
             ScreenAsh::GetMaximizedWindowBoundsInParent(
                 secondary->GetNativeView()).ToString());
 
   // Unmaximized work area bounds
-  EXPECT_EQ("0,0 600x552",
+  EXPECT_EQ("0,0 600x597",
             ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent(
                 primary->GetNativeView()).ToString());
   EXPECT_EQ("0,0 500x500",
             ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent(
                 secondary->GetNativeView()).ToString());
 
   // Display bounds
   EXPECT_EQ("0,0 600x600",
             ScreenAsh::GetDisplayBoundsInParent(
                 primary->GetNativeView()).ToString());
   EXPECT_EQ("0,0 500x500",
             ScreenAsh::GetDisplayBoundsInParent(
                 secondary->GetNativeView()).ToString());
 
   // Work area bounds
-  EXPECT_EQ("0,0 600x552",
+  EXPECT_EQ("0,0 600x597",
             ScreenAsh::GetDisplayWorkAreaBoundsInParent(
                 primary->GetNativeView()).ToString());
   EXPECT_EQ("0,0 500x500",
             ScreenAsh::GetDisplayWorkAreaBoundsInParent(
                 secondary->GetNativeView()).ToString());
 }
 #endif
 
 TEST_F(ScreenAshTest, ConvertRect) {
   UpdateDisplay("600x600,500x500");
@@ skipping 19 matching lines @@
       ScreenAsh::ConvertRectToScreen(
           primary->GetNativeView(), gfx::Rect(30, 30, 100, 100)).ToString());
   EXPECT_EQ(
       "650,50 100x100",
       ScreenAsh::ConvertRectToScreen(
           secondary->GetNativeView(), gfx::Rect(40, 40, 100, 100)).ToString());
 }
 
 }  // namespace test
 }  // namespace ash