Autohide behavior simplified to always/never

ash/launcher/launcher_context_menu_unittest.cc

Index: ash/launcher/launcher_context_menu_unittest.cc
diff --git a/ash/launcher/launcher_context_menu_unittest.cc b/ash/launcher/launcher_context_menu_unittest.cc
index 29faa9e46b62f6af3a2c67cb1f1de033df450614..0fc9318ec94d6977e38668dd857d682a9e39f712 100644
--- a/ash/launcher/launcher_context_menu_unittest.cc
+++ b/ash/launcher/launcher_context_menu_unittest.cc
@@ -29,29 +29,25 @@ TEST_F(LauncherContextMenuTest, ToggleAutoHide) {
   wm::ActivateWindow(window.get());
 
   Shell* shell = Shell::GetInstance();
-  // If the auto-hide behavior isn't DEFAULT, the rest of the tests don't make
-  // sense.
-  EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT,
-            shell->GetShelfAutoHideBehavior());
-  EXPECT_FALSE(LauncherContextMenu::IsAutoHideMenuHideChecked());
-  shell->SetShelfAutoHideBehavior(
-      LauncherContextMenu::GetToggledAutoHideBehavior());
+  shell->SetShelfAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
             shell->GetShelfAutoHideBehavior());
+  EXPECT_TRUE(LauncherContextMenu::IsAutoHideMenuHideChecked());
   shell->SetShelfAutoHideBehavior(
       LauncherContextMenu::GetToggledAutoHideBehavior());
-  EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT,
+  EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
             shell->GetShelfAutoHideBehavior());
 
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
-  EXPECT_TRUE(LauncherContextMenu::IsAutoHideMenuHideChecked());
+  EXPECT_FALSE(LauncherContextMenu::IsAutoHideMenuHideChecked());
   shell->SetShelfAutoHideBehavior(
       LauncherContextMenu::GetToggledAutoHideBehavior());
-  EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
+  EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
             shell->GetShelfAutoHideBehavior());
+  EXPECT_TRUE(LauncherContextMenu::IsAutoHideMenuHideChecked());
   shell->SetShelfAutoHideBehavior(
       LauncherContextMenu::GetToggledAutoHideBehavior());
-  EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT,
+  EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
             shell->GetShelfAutoHideBehavior());
 }