Refactor OmniboxEditModel::user_text_ to not include keyword

components/omnibox/browser/omnibox_edit_model.h

Index: components/omnibox/browser/omnibox_edit_model.h
diff --git a/components/omnibox/browser/omnibox_edit_model.h b/components/omnibox/browser/omnibox_edit_model.h
index c4d6d2d5af560196cfcdfc2cd174cf80d38a734e..de6ff02da4bedd70185ef080522c523a1a475c2d 100644
--- a/components/omnibox/browser/omnibox_edit_model.h
+++ b/components/omnibox/browser/omnibox_edit_model.h
@@ -388,8 +388,8 @@ class OmniboxEditModel {
   // Conversion between user text and display text. User text is the text the
   // user has input. Display text is the text being shown in the edit. The
   // two are different if a keyword is selected.
-  base::string16 DisplayTextFromUserText(const base::string16& text) const;
-  base::string16 UserTextFromDisplayText(const base::string16& text) const;
+  base::string16 MaybeStripKeyword(const base::string16& text) const;
+  base::string16 MaybePrependKeyword(const base::string16& text) const;
 
   // If there's a selected match, copies it into |match|. Else, returns the
   // default match for the current text, as well as the alternate nav URL, if