Reland of Delete pre-MD code from OmniboxResultView

components/omnibox/browser/omnibox_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.
 
 // This file defines helper functions shared by the various implementations
 // of OmniboxView.
 
 #include "components/omnibox/browser/omnibox_view.h"
 
 #include <utility>
@@ skipping 61 matching lines @@
       match, disposition, alternate_nav_url, pasted_text, selected_line);
   // WARNING: |match| may refer to a deleted object at this point!
   OnMatchOpened(match_type);
 }
 
 bool OmniboxView::IsEditingOrEmpty() const {
   return (model_.get() && model_->user_input_in_progress()) ||
       (GetOmniboxTextLength() == 0);
 }
 
-int OmniboxView::GetIcon() const {
-  if (!IsEditingOrEmpty())
-    return controller_->GetToolbarModel()->GetIcon();
-  int id = AutocompleteMatch::TypeToIcon(model_.get() ?
-      model_->CurrentTextType() : AutocompleteMatchType::URL_WHAT_YOU_TYPED);
-  return (id == IDR_OMNIBOX_HTTP) ? IDR_LOCATION_BAR_HTTP : id;
-}
-
 gfx::VectorIconId OmniboxView::GetVectorIcon() const {
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
   if (!IsEditingOrEmpty())
     return controller_->GetToolbarModel()->GetVectorIcon();
 
   return AutocompleteMatch::TypeToVectorIcon(
       model_ ? model_->CurrentTextType()
              : AutocompleteMatchType::URL_WHAT_YOU_TYPED);
-#else
-  NOTIMPLEMENTED();
-  return gfx::VectorIconId::VECTOR_ICON_NONE;
-#endif
 }
 
 void OmniboxView::SetUserText(const base::string16& text) {
   SetUserText(text, true);
 }
 
 void OmniboxView::SetUserText(const base::string16& text,
                               bool update_popup) {
   if (model_.get())
     model_->SetUserText(text);
@@ skipping 79 matching lines @@
   if (client) {
     model_.reset(new OmniboxEditModel(this, controller, std::move(client)));
   }
 }
 
 void OmniboxView::TextChanged() {
   EmphasizeURLComponents();
   if (model_.get())
     model_->OnChanged();
 }