Cleanup enums for shelf

ash/launcher/launcher_tooltip_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/launcher/launcher_tooltip_manager.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/shelf_layout_manager.h"
@@ skipping 92 matching lines @@
   // Create a full-screen window to hide the shelf.
   scoped_ptr<views::Widget> widget(new views::Widget);
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
   widget->SetFullscreen(true);
   widget->Show();
 
   // Once the shelf is hidden, the tooltip should be invisible.
   ASSERT_EQ(
-      internal::ShelfLayoutManager::HIDDEN,
+      SHELF_HIDDEN,
       Shell::GetPrimaryRootWindowController()->shelf()->visibility_state());
   EXPECT_FALSE(TooltipIsVisible());
 
   // Do not show the view if the shelf is hidden.
   ShowImmediately();
   EXPECT_FALSE(TooltipIsVisible());
 
   // ShowDelayed() doesn't even start the timer for the hidden shelf.
   ShowDelayed();
   EXPECT_FALSE(IsTimerRunning());
 }
 
 TEST_F(LauncherTooltipManagerTest, HideWhenShelfIsAutoHide) {
   ShowImmediately();
   ASSERT_TRUE(TooltipIsVisible());
 
   internal::ShelfLayoutManager* shelf =
       Shell::GetPrimaryRootWindowController()->shelf();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   shelf->UpdateAutoHideState();
-  ASSERT_EQ(internal::ShelfLayoutManager::AUTO_HIDE_HIDDEN,
-            shelf->auto_hide_state());
+  ASSERT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
 
   // Tooltip visibility change for auto hide may take time.
   EXPECT_TRUE(TooltipIsVisible());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(TooltipIsVisible());
 
   // Do not show the view if the shelf is hidden.
   ShowImmediately();
   EXPECT_FALSE(TooltipIsVisible());
 
@@ skipping 67 matching lines @@
   // Should hide if the mouse is out of the tooltip.
   test_api.set_location(tooltip_rect.origin() + gfx::Vector2d(-1, -1));
   EXPECT_EQ(ui::ER_UNHANDLED,
             event_handler->OnMouseEvent(&mouse_event));
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(TooltipIsVisible());
 }
 
 }  // namespace test
 }  // namespace ash