Remove unused ash::SHELF_ALIGNMENT_TOP

ash/shelf/shelf_layout_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/shelf/shelf_layout_manager.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
@@ skipping 163 matching lines @@
       EXPECT_EQ(GetShelfWidget()->GetWindowBoundsInScreen(),
                 GetShelfWidget()->GetDimmerBoundsForTest());
 
     // The shelf should never be smaller than the hidden state.
     EXPECT_GE(shelf_bounds.height(), not_visible_bounds_.height());
     float scroll_delta = GetShelfLayoutManager()->PrimaryAxisValue(
         scroll_.y(),
         scroll_.x());
     bool increasing_drag =
         GetShelfWidget()->shelf()->SelectValueForShelfAlignment(
-            scroll_delta < 0, scroll_delta > 0,
-            scroll_delta < 0, scroll_delta > 0);
+            scroll_delta < 0, scroll_delta > 0, scroll_delta < 0);
     int shelf_size = GetShelfLayoutManager()->PrimaryAxisValue(
         shelf_bounds.height(),
         shelf_bounds.width());
     int visible_bounds_size = GetShelfLayoutManager()->PrimaryAxisValue(
         visible_bounds_.height(),
         visible_bounds_.width());
     int not_visible_bounds_size = GetShelfLayoutManager()->PrimaryAxisValue(
         not_visible_bounds_.height(),
         not_visible_bounds_.width());
     if (was_visible_on_drag_start_) {
@@ skipping 1504 matching lines @@
 }
 
 
 #if defined(OS_WIN)
 // RootWindow and Display can't resize on Windows Ash. http://crbug.com/165962
 #define MAYBE_SetAlignment DISABLED_SetAlignment
 #else
 #define MAYBE_SetAlignment SetAlignment
 #endif
 
-// Tests SHELF_ALIGNMENT_(LEFT, RIGHT, TOP).
+// Tests SHELF_ALIGNMENT_(LEFT, RIGHT).
 TEST_F(ShelfLayoutManagerTest, MAYBE_SetAlignment) {
   ShelfLayoutManager* shelf = GetShelfLayoutManager();
   // Force an initial layout.
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   shelf->LayoutShelf();
   EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());
 
   shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
   gfx::Rect shelf_bounds(
       GetShelfWidget()->GetWindowBoundsInScreen());
@@ skipping 46 matching lines @@
   EXPECT_EQ(0, display.GetWorkAreaInsets().left());
   EXPECT_EQ(display.work_area().right(), shelf_bounds.x());
   EXPECT_EQ(display.bounds().y(), shelf_bounds.y());
   EXPECT_EQ(display.bounds().height(), shelf_bounds.height());
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   display = screen->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
   EXPECT_EQ(ShelfLayoutManager::kAutoHideSize,
       display.GetWorkAreaInsets().right());
   EXPECT_EQ(ShelfLayoutManager::kAutoHideSize,
       display.bounds().right() - display.work_area().right());
-
-  shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
-  shelf->SetAlignment(SHELF_ALIGNMENT_TOP);
-  display = screen->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
-  shelf_bounds = GetShelfWidget()->GetWindowBoundsInScreen();
-  display = screen->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
-  ASSERT_NE(-1, display.id());
-  EXPECT_EQ(shelf->GetIdealBounds().height(),
-            display.GetWorkAreaInsets().top());
-  EXPECT_GE(shelf_bounds.height(),
-            GetShelfWidget()->GetContentsView()->GetPreferredSize().height());
-  EXPECT_EQ(SHELF_ALIGNMENT_TOP, GetSystemTray()->shelf_alignment());
-  status_bounds = gfx::Rect(status_area_widget->GetWindowBoundsInScreen());
-  EXPECT_GE(status_bounds.height(),
-            status_area_widget->GetContentsView()->GetPreferredSize().height());
-  EXPECT_EQ(shelf->GetIdealBounds().height(),
-            display.GetWorkAreaInsets().top());
-  EXPECT_EQ(0, display.GetWorkAreaInsets().right());
-  EXPECT_EQ(0, display.GetWorkAreaInsets().bottom());
-  EXPECT_EQ(0, display.GetWorkAreaInsets().left());
-  EXPECT_EQ(display.work_area().y(), shelf_bounds.bottom());
-  EXPECT_EQ(display.bounds().x(), shelf_bounds.x());
-  EXPECT_EQ(display.bounds().width(), shelf_bounds.width());
-  shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
-  display = screen->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
-  EXPECT_EQ(ShelfLayoutManager::kAutoHideSize,
-      display.GetWorkAreaInsets().top());
-  EXPECT_EQ(ShelfLayoutManager::kAutoHideSize,
-            display.work_area().y() - display.bounds().y());
 }
 
 TEST_F(ShelfLayoutManagerTest, GestureEdgeSwipe) {
   ShelfLayoutManager* shelf = GetShelfLayoutManager();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.bounds = gfx::Rect(0, 0, 200, 200);
   params.context = CurrentContext();
   widget->Init(params);
@@ skipping 544 matching lines @@
   StatusAreaWidget* status_area_widget =
       Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget();
   EXPECT_TRUE(status_area_widget->IsVisible());
   // Shelf should be in the first display's area.
   // TODO: make this test more robust against changes in font, font size.
   EXPECT_EQ("353,453 147x47",
             status_area_widget->GetWindowBoundsInScreen().ToString());
 }
 
 }  // namespace ash