Clean up some ash constants.

ash/wm/workspace/workspace_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/wm/workspace/workspace_layout_manager.h"
 
 #include <string>
 #include <utility>
 
 #include "ash/public/cpp/config.h"
@@ skipping 202 matching lines @@
       CreateTestWindow(gfx::Rect(1, 2, 30, 40)));
   WmWindow* window = window_owner->window();
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
 
   wm::WindowState* window_state = window->GetWindowState();
   window_state->SetRestoreBoundsInScreen(gfx::Rect(400, 0, 30, 40));
   // Maximize the window in 2nd display as the restore bounds
   // is inside 2nd display.
   window_state->Maximize();
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
-  EXPECT_EQ(
-      gfx::Rect(300, 0, 400, 500 - GetShelfConstant(SHELF_SIZE)).ToString(),
-      window->GetBoundsInScreen().ToString());
+  EXPECT_EQ(gfx::Rect(300, 0, 400, 500 - kShelfSize).ToString(),
+            window->GetBoundsInScreen().ToString());
 
   window_state->Restore();
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
   EXPECT_EQ("400,0 30x40", window->GetBoundsInScreen().ToString());
 
   // If the restore bounds intersects with the current display,
   // don't move.
   window_state->SetRestoreBoundsInScreen(gfx::Rect(295, 0, 30, 40));
   window_state->Maximize();
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
-  EXPECT_EQ(
-      gfx::Rect(300, 0, 400, 500 - GetShelfConstant(SHELF_SIZE)).ToString(),
-      window->GetBoundsInScreen().ToString());
+  EXPECT_EQ(gfx::Rect(300, 0, 400, 500 - kShelfSize).ToString(),
+            window->GetBoundsInScreen().ToString());
 
   window_state->Restore();
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
   EXPECT_EQ("295,0 30x40", window->GetBoundsInScreen().ToString());
 
   // Restoring widget state.
   std::unique_ptr<views::Widget> w1(new views::Widget);
   views::Widget::InitParams params;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.delegate = new MaximizeDelegateView(gfx::Rect(400, 0, 30, 40));
   ConfigureWidgetInitParamsForDisplay(root_windows[0], &params);
   w1->Init(params);
   EXPECT_EQ(root_windows[0],
             WmWindow::Get(w1->GetNativeWindow())->GetRootWindow());
   w1->Show();
   EXPECT_TRUE(w1->IsMaximized());
   EXPECT_EQ(root_windows[1],
             WmWindow::Get(w1->GetNativeWindow())->GetRootWindow());
-  EXPECT_EQ(
-      gfx::Rect(300, 0, 400, 500 - GetShelfConstant(SHELF_SIZE)).ToString(),
-      w1->GetWindowBoundsInScreen().ToString());
+  EXPECT_EQ(gfx::Rect(300, 0, 400, 500 - kShelfSize).ToString(),
+            w1->GetWindowBoundsInScreen().ToString());
   w1->Restore();
   EXPECT_EQ(root_windows[1],
             WmWindow::Get(w1->GetNativeWindow())->GetRootWindow());
   EXPECT_EQ("400,0 30x40", w1->GetWindowBoundsInScreen().ToString());
 }
 
 TEST_F(WorkspaceLayoutManagerTest, FullscreenInDisplayToBeRestored) {
   UpdateDisplay("300x400,400x500");
 
   WmWindow::Windows root_windows = ShellPort::Get()->GetAllRootWindows();
@@ skipping 1006 matching lines @@
   window->SetBounds(keyboard_bounds());
   window->GetWindowState()->set_ignore_keyboard_bounds_change(true);
   window->Activate();
 
   EXPECT_EQ(keyboard_bounds(), window->GetBounds());
   ShowKeyboard();
   EXPECT_EQ(keyboard_bounds(), window->GetBounds());
 }
 
 }  // namespace ash