Refactor OmniboxEditModel::user_text_ to not include keyword

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 95 matching lines @@
   return (id == gfx::VectorIconId::OMNIBOX_HTTP)
              ? gfx::VectorIconId::LOCATION_BAR_HTTP
              : id;
 #else
   NOTIMPLEMENTED();
   return gfx::VectorIconId::VECTOR_ICON_NONE;
 #endif
 }
 
 void OmniboxView::SetUserText(const base::string16& text) {
-  SetUserText(text, text, true);
+  SetUserText(text, true);
 }
 
 void OmniboxView::SetUserText(const base::string16& text,
-                              const base::string16& display_text,
                               bool update_popup) {
   if (model_.get())
     model_->SetUserText(text);
-  SetWindowTextAndCaretPos(display_text, display_text.length(), update_popup,
-                           true);
+  SetWindowTextAndCaretPos(text, text.length(), update_popup, true);
 }
 
 void OmniboxView::ShowURL() {
   SetFocus();
   controller_->GetToolbarModel()->set_url_replacement_enabled(false);
   model_->UpdatePermanentText();
   RevertWithoutResettingSearchTermReplacement();
   SelectAll(true);
 }
 
@@ skipping 46 matching lines @@
   if (client) {
     model_.reset(new OmniboxEditModel(this, controller, std::move(client)));
   }
 }
 
 void OmniboxView::TextChanged() {
   EmphasizeURLComponents();
   if (model_.get())
     model_->OnChanged();
 }