Refactor OmniboxEditModel::user_text_ to not include keyword

components/omnibox/browser/omnibox_view.h

 // 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 the interface class OmniboxView.  Each toolkit will
 // implement the edit view differently, so that code is inherently platform
 // specific.  However, the OmniboxEditModel needs to do some communication with
 // the view.  Since the model is shared between platforms, we need to define an
 // interface that all view implementations will share.
 
@@ skipping 70 matching lines @@
   // Like GetIcon(), but returns a vector icon identifier. If |invert| is true,
   // this returns an icon suitable for display in an inverted (light-on-dark)
   // color scheme.
   gfx::VectorIconId GetVectorIcon(bool invert) const;
 
   // The user text is the text the user has manually keyed in.  When present,
   // this is shown in preference to the permanent text; hitting escape will
   // revert to the permanent text.
   void SetUserText(const base::string16& text);
   virtual void SetUserText(const base::string16& text,
-                           const base::string16& display_text,
                            bool update_popup);
 
   // Sets the window text and the caret position. |notify_text_changed| is true
   // if the model should be notified of the change.
   virtual void SetWindowTextAndCaretPos(const base::string16& text,
                                         size_t caret_pos,
                                         bool update_popup,
                                         bool notify_text_changed) = 0;
 
   // Sets the edit to forced query mode.  Practically speaking, this means that
@@ skipping 162 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ShowURL);
 
   // |model_| can be NULL in tests.
   std::unique_ptr<OmniboxEditModel> model_;
   OmniboxEditController* controller_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxView);
 };
 
 #endif  // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_VIEW_H_