Clean up some ash constants.

ash/wm/workspace/workspace_window_resizer_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/wm/workspace/workspace_window_resizer.h"
 
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_constants.h"
@@ skipping 1007 matching lines @@
   EXPECT_EQ("465,112 320x160", window_->bounds().ToString());
   resizer->Drag(CalculateDragPoint(*resizer, distance_to_right - 7, 0), 0);
   EXPECT_EQ("480,112 320x160", window_->bounds().ToString());
   resizer->Drag(CalculateDragPoint(*resizer, distance_to_right + 15, 0), 0);
   EXPECT_EQ("480,112 320x160", window_->bounds().ToString());
   resizer->Drag(CalculateDragPoint(*resizer, distance_to_right + 32, 0), 0);
   EXPECT_EQ("512,112 320x160", window_->bounds().ToString());
   resizer->Drag(CalculateDragPoint(*resizer, distance_to_right + 33, 0), 0);
   EXPECT_EQ("513,112 320x160", window_->bounds().ToString());
 
-  int auto_hidden_shelf_height = GetShelfConstant(SHELF_INSETS_FOR_AUTO_HIDE);
-
   // And the bottom should snap too.
-  resizer->Drag(
-      CalculateDragPoint(*resizer, 0,
-                         distance_to_bottom - auto_hidden_shelf_height - 7),
-      0);
+  resizer->Drag(CalculateDragPoint(*resizer, 0, distance_to_bottom - 7), 0);
   EXPECT_EQ(gfx::Rect(96, 440, 320, 160).ToString(),
             window_->bounds().ToString());
-  resizer->Drag(
-      CalculateDragPoint(*resizer, 0,
-                         distance_to_bottom - auto_hidden_shelf_height + 15),
-      0);
+  resizer->Drag(CalculateDragPoint(*resizer, 0, distance_to_bottom + 15), 0);
   EXPECT_EQ(gfx::Rect(96, 440, 320, 160).ToString(),
             window_->bounds().ToString());
   resizer->Drag(CalculateDragPoint(*resizer, 0, distance_to_bottom - 2 + 32),
                 0);
   EXPECT_EQ("96,470 320x160", window_->bounds().ToString());
   resizer->Drag(CalculateDragPoint(*resizer, 0, distance_to_bottom - 2 + 33),
                 0);
   EXPECT_EQ("96,471 320x160", window_->bounds().ToString());
 
   // And the top should snap too.
   resizer->Drag(CalculateDragPoint(*resizer, 0, -distance_to_top + 20), 0);
   EXPECT_EQ("96,20 320x160", window_->bounds().ToString());
   resizer->Drag(CalculateDragPoint(*resizer, 0, -distance_to_top + 7), 0);
   EXPECT_EQ("96,0 320x160", window_->bounds().ToString());
 
   // And bottom/left should snap too.
-  resizer->Drag(
-      CalculateDragPoint(*resizer, 7 - distance_to_left,
-                         distance_to_bottom - auto_hidden_shelf_height - 7),
-      0);
+  resizer->Drag(CalculateDragPoint(*resizer, 7 - distance_to_left,
+                                   distance_to_bottom - 7),
+                0);
   EXPECT_EQ(gfx::Rect(0, 440, 320, 160).ToString(),
             window_->bounds().ToString());
-  resizer->Drag(
-      CalculateDragPoint(*resizer, -15 - distance_to_left,
-                         distance_to_bottom - auto_hidden_shelf_height + 15),
-      0);
+  resizer->Drag(CalculateDragPoint(*resizer, -15 - distance_to_left,
+                                   distance_to_bottom + 15),
+                0);
   EXPECT_EQ(gfx::Rect(0, 440, 320, 160).ToString(),
             window_->bounds().ToString());
   // should move past snap points.
   resizer->Drag(CalculateDragPoint(*resizer, -32 - distance_to_left,
                                    distance_to_bottom - 2 + 32),
                 0);
   EXPECT_EQ("-32,470 320x160", window_->bounds().ToString());
   resizer->Drag(CalculateDragPoint(*resizer, -33 - distance_to_left,
                                    distance_to_bottom - 2 + 33),
                 0);
@@ skipping 788 matching lines @@
             touch_resize_window_->bounds().ToString());
   // Drag even more to snap to the edge.
   generator.GestureScrollSequence(gfx::Point(400, kRootHeight - 40),
                                   gfx::Point(400, kRootHeight - 25),
                                   base::TimeDelta::FromMilliseconds(10), 5);
   EXPECT_EQ(gfx::Rect(100, 100, 600, kRootHeight - 100).ToString(),
             touch_resize_window_->bounds().ToString());
 }
 
 }  // namespace ash