Consolidate some more ash tray constants.

ash/common/system/tray/system_tray.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/common/system/tray/system_tray.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 80 matching lines @@
  private:
   class PaddingView : public views::View {
    public:
     PaddingView() {}
     ~PaddingView() override {}
 
    private:
     gfx::Size GetPreferredSize() const override {
       // The other tray items already have some padding baked in so we have to
       // subtract that off.
-      const int side =
-          kTrayEdgePadding - GetTrayConstant(TRAY_IMAGE_ITEM_PADDING);
+      const int side = kTrayEdgePadding - kTrayImageItemPadding;
       return gfx::Size(side, side);
     }
 
     DISALLOW_COPY_AND_ASSIGN(PaddingView);
   };
 
   DISALLOW_COPY_AND_ASSIGN(PaddingTrayItem);
 };
 
 }  // namespace
@@ skipping 775 matching lines @@
           .work_area()
           .height();
   if (work_area_height > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
         100 * bubble_view->height() / work_area_height, 1, 300, 100);
   }
 }
 
 }  // namespace ash