Remove IconLabelView layout constants.

chrome/browser/ui/views/omnibox/omnibox_result_view.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.
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>  // NOLINT
 #include <atlwin.h>  // NOLINT
@@ skipping 636 matching lines @@
   // Pre-MD, normal icons are 19 px wide, while extension icons are 16 px wide.
   // The code in IconLabelBubbleView::Layout() positions these icons in the
   // omnibox using ICON_LABEL_VIEW_TRAILING_PADDING, so we use that here as well
   // so the icons will line up.
   //
   // Technically we don't need the IsModeMaterial() check here, but it will make
   // it easier to see that all this code is dead once we switch to MD.
   int icon_x = start_x;
   if (!ui::MaterialDesignController::IsModeMaterial() &&
       (icon.width() != default_icon_size_))
-    icon_x += GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING);
+    icon_x += IconLabelBubbleView::kTrailingPaddingPreMD;
   icon_bounds_.SetRect(icon_x, (GetContentLineHeight() - icon.height()) / 2,
                        icon.width(), icon.height());
 
   const int text_x = start_x + default_icon_size_ + horizontal_padding;
   int text_width = end_x - text_x;
 
   if (match_.associated_keyword.get()) {
     const int max_kw_x = end_x - keyword_icon_->width();
     const int kw_x = animation_->CurrentValueBetween(max_kw_x, start_x);
     const int kw_text_x = kw_x + keyword_icon_->width() + horizontal_padding;
@@ skipping 164 matching lines @@
 
 int OmniboxResultView::StartMargin() const {
   return ui::MaterialDesignController::IsModeMaterial() ?
       model_->start_margin() : 0;
 }
 
 int OmniboxResultView::EndMargin() const {
   return ui::MaterialDesignController::IsModeMaterial() ?
       model_->end_margin() : 0;
 }