Last round of cleaning up MD layout constants.

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

 // Copyright 2013 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 "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/layout_constants.h"
@@ skipping 218 matching lines @@
   void ExpectTabStripAndMinimumSize(bool caption_buttons_on_left) {
     int caption_buttons_width = kCaptionButtonsWidth;
     bool show_caption_buttons = delegate_->ShouldShowCaptionButtons();
     bool maximized = delegate_->IsMaximized() || !show_caption_buttons;
     if (avatar_button_) {
       caption_buttons_width +=
           avatar_button_->GetPreferredSize().width() +
           (maximized ? OBFVL::kCaptionSpacing
                      : -GetLayoutSize(NEW_TAB_BUTTON).width());
     }
-    int tabstrip_x = GetLayoutConstant(AVATAR_ICON_PADDING);
+    int tabstrip_x = OpaqueBrowserFrameView::kAvatarIconPadding;
     if (show_caption_buttons && caption_buttons_on_left) {
       int right_of_close =
           maximized ? kMaximizedExtraCloseWidth : OBFVL::kFrameBorderThickness;
       tabstrip_x += caption_buttons_width + right_of_close;
     } else if (!maximized) {
       tabstrip_x += kNonClientBorderThickness;
     }
     gfx::Size tabstrip_min_size(delegate_->GetTabstripPreferredSize());
     gfx::Rect tabstrip_bounds(
         layout_manager_->GetBoundsForTabStrip(tabstrip_min_size, kWindowWidth));
@@ skipping 175 matching lines @@
 
   for (int i = 0; i < 2; ++i) {
     root_view_->Layout();
     SCOPED_TRACE(i == 0 ? "Window is restored" : "Window is maximized");
     ExpectCaptionButtons(false, 0);
     ExpectTabStripAndMinimumSize(false);
     ExpectAvatar();
     delegate_->set_maximized(true);
   }
 }