Last round of cleaning up MD layout constants.

chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc
index 58cf38f81fbc7746d4234cd7f43134b57d8f1423..8c303f690bee11ff1e29cfd892602ac7b1d5fc1b 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc
@@ -371,11 +371,12 @@ void BrowserNonClientFrameViewMus::TabStripDeleted(TabStrip* tab_strip) {
 }
 
 int BrowserNonClientFrameViewMus::GetTabStripLeftInset() const {
-  const int pad = GetLayoutConstant(AVATAR_ICON_PADDING);
-  const int avatar_right = profile_indicator_icon()
-      ? (pad + GetIncognitoAvatarIcon().width())
-      : 0;
-  return avatar_right + pad + frame_values().normal_insets.left();
+  const int avatar_right =
+      profile_indicator_icon()
+          ? (kAvatarIconPadding + GetIncognitoAvatarIcon().width())
+          : 0;
+  return avatar_right + kAvatarIconPadding +
+         frame_values().normal_insets.left();
 }
 
 int BrowserNonClientFrameViewMus::GetTabStripRightInset() const {
@@ -424,9 +425,8 @@ void BrowserNonClientFrameViewMus::LayoutIncognitoButton() {
   DCHECK(browser_view()->IsTabStripVisible());
 #endif
   gfx::ImageSkia incognito_icon = GetIncognitoAvatarIcon();
-  const int pad = GetLayoutConstant(AVATAR_ICON_PADDING);
-  int avatar_bottom =
-      GetTopInset(false) + browser_view()->GetTabStripHeight() - pad;
+  int avatar_bottom = GetTopInset(false) + browser_view()->GetTabStripHeight() -
+                      kAvatarIconPadding;
   int avatar_y = avatar_bottom - incognito_icon.height();
 
   // Hide the incognito icon in immersive fullscreen when the tab light bar is
@@ -435,7 +435,8 @@ void BrowserNonClientFrameViewMus::LayoutIncognitoButton() {
   bool avatar_visible = !UseImmersiveLightbarHeaderStyle();
   int avatar_height = avatar_visible ? incognito_icon.height() : 0;
 
-  gfx::Rect avatar_bounds(pad, avatar_y, incognito_icon.width(), avatar_height);
+  gfx::Rect avatar_bounds(kAvatarIconPadding, avatar_y, incognito_icon.width(),
+                          avatar_height);
   profile_indicator_icon()->SetBoundsRect(avatar_bounds);
   profile_indicator_icon()->SetVisible(avatar_visible);
 }