Adjust omnibox and dropdown text position to be correct.

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 180 matching lines @@
       model_index_(model_index),
       location_bar_view_(location_bar_view),
       font_list_(font_list),
       font_height_(std::max(
           font_list.GetHeight(),
           font_list.DeriveWithWeight(gfx::Font::Weight::BOLD).GetHeight())),
       mirroring_context_(new MirroringContext()),
       keyword_icon_(new views::ImageView()),
       animation_(new gfx::SlideAnimation(this)) {
   CHECK_GE(model_index, 0);
-  if (default_icon_size_ == 0) {
-    default_icon_size_ =
-        location_bar_view_->GetThemeProvider()->GetImageSkiaNamed(
-            AutocompleteMatch::TypeToIcon(
-                AutocompleteMatchType::URL_WHAT_YOU_TYPED))->width();
-  }
+  if (default_icon_size_ == 0)
+    default_icon_size_ = location_bar_view_->GetLocationIconWidth();
   keyword_icon_->set_owned_by_client();
   keyword_icon_->EnableCanvasFlippingForRTLUI(true);
   keyword_icon_->SetImage(GetKeywordIcon());
   keyword_icon_->SizeToPreferredSize();
 }
 
 OmniboxResultView::~OmniboxResultView() {
 }
 
 SkColor OmniboxResultView::GetColor(
@@ skipping 615 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;
 }