Autohide behavior simplified to always/never

ash/screen_ash_unittest.cc

Index: ash/screen_ash_unittest.cc
diff --git a/ash/screen_ash_unittest.cc b/ash/screen_ash_unittest.cc
index 3d94910e64034822e5fe73d7e56ca80e636e10c8..771415991d40f1646d44e8265203ac596eae3d5f 100644
--- a/ash/screen_ash_unittest.cc
+++ b/ash/screen_ash_unittest.cc
@@ -22,6 +22,8 @@ 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));
@@ -39,7 +41,7 @@ TEST_F(ScreenAshTest, Bounds) {
                 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",
@@ -55,7 +57,7 @@ TEST_F(ScreenAshTest, Bounds) {
                 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",