Update shelf spacing in Chrome OS according to the MD specs

ash/system/toast/toast_manager_unittest.cc

 // Copyright 2016 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/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
+#include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/system/toast/toast_manager.h"
 #include "ash/test/ash_test_base.h"
 #include "base/run_loop.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 
 namespace ash {
 
 // Long duration so the timeout doesn't occur.
@@ skipping 162 matching lines @@
 
   manager()->Show("DUMMY", kLongLongDuration /* prevent timeout */);
   EXPECT_EQ(1, GetToastId());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::Rect root_bounds =
       ScreenUtil::GetShelfDisplayBoundsInRoot(Shell::GetPrimaryRootWindow());
 
   EXPECT_TRUE(toast_bounds.Intersects(shelf->user_work_area_bounds()));
   EXPECT_NEAR(root_bounds.CenterPoint().x(), toast_bounds.CenterPoint().x(), 1);
-  EXPECT_EQ(root_bounds.bottom() - ShelfLayoutManager::kAutoHideSize - 5,
-            toast_bounds.bottom());
+  EXPECT_EQ(root_bounds.bottom() - kAutoHideSize - 5, toast_bounds.bottom());
 }
 
 TEST_F(ToastManagerTest, PositionWithHiddenBottomShelf) {
   ShelfLayoutManager* shelf =
       Shelf::ForPrimaryDisplay()->shelf_layout_manager();
   SetShelfAutoHideBehavior(SHELF_AUTO_HIDE_ALWAYS_HIDDEN);
   SetShelfAlignment(wm::SHELF_ALIGNMENT_BOTTOM);
   SetShelfState(ash::SHELF_HIDDEN);
 
   manager()->Show("DUMMY", kLongLongDuration /* prevent timeout */);
@@ skipping 64 matching lines @@
     // doesn't return correct value.
     gfx::Rect shelf_bounds = shelf->GetIdealBounds();
     EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds));
     EXPECT_EQ(shelf_bounds.y() - 5, toast_bounds.bottom());
     EXPECT_EQ(root_bounds.bottom() - shelf_bounds.height() - 5,
               toast_bounds.bottom());
   }
 }
 
 }  // namespace ash