Revert of AutoHide Behavior

ash/launcher/launcher_context_menu_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/launcher/launcher_context_menu.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
@@ skipping 11 matching lines @@
 TEST_F(LauncherContextMenuTest, ToggleAutoHide) {
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   window->SetType(aura::client::WINDOW_TYPE_NORMAL);
   window->Init(ui::LAYER_TEXTURED);
   window->SetParent(NULL);
   window->Show();
   wm::ActivateWindow(window.get());
 
   Shell* shell = Shell::GetInstance();
-  shell->SetShelfAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
+  // 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());
   EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
             shell->GetShelfAutoHideBehavior());
+  shell->SetShelfAutoHideBehavior(
+      LauncherContextMenu::GetToggledAutoHideBehavior());
+  EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT,
+            shell->GetShelfAutoHideBehavior());
+
+  window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   EXPECT_TRUE(LauncherContextMenu::IsAutoHideMenuHideChecked());
   shell->SetShelfAutoHideBehavior(
       LauncherContextMenu::GetToggledAutoHideBehavior());
   EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
             shell->GetShelfAutoHideBehavior());
-
-  window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
-  EXPECT_FALSE(LauncherContextMenu::IsAutoHideMenuHideChecked());
   shell->SetShelfAutoHideBehavior(
       LauncherContextMenu::GetToggledAutoHideBehavior());
-  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_NEVER,
+  EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT,
             shell->GetShelfAutoHideBehavior());
 }
 
 }  // namespace ash