Reland "Omnibox UI: Trivial refactor of redundant logic."

This is a reland of eb0754126c4ea3ef3aa55b65e607fe8204b6e197

Original change's description:
> Omnibox UI: Trivial refactor of redundant logic.
>
> Bug: NONE
> Change-Id: I081af3892dc52f73d7d92aed9b417defa862f8be
> Reviewed-on: https://chromium-review.googlesource.com/1168512
> Reviewed-by: Kevin Bailey <krb@chromium.org>

TBR=krb@chromium.org

Bug: NONE
Change-Id: Ie94842ac68a918714e3ddd258ee61b885ec371b5
Reviewed-on: https://chromium-review.googlesource.com/1169930
Commit-Queue: Tommy Li <tommycli@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582213}

chrome/browser/ui/views/location_bar/location_bar_view.cc

@@ -979,8 +979,7 @@ base::string16 LocationBarView::GetLocationIconText() const {
 }
 
 bool LocationBarView::ShouldShowKeywordBubble() const {
-  return !omnibox_view_->model()->keyword().empty() &&
-         !omnibox_view_->model()->is_keyword_hint();
+  return omnibox_view_->model()->is_keyword_selected();
 }
 
 bool LocationBarView::ShouldShowLocationIconText() const {

chrome/browser/ui/views/location_bar/location_bar_view.h

@@ -317,6 +317,7 @@ class LocationBarView : public LocationBar,
   // - For chrome:// URLs, returns the short product name (e.g. Chrome).
   base::string16 GetLocationIconText() const;
 
+  // Returns true if a keyword is selected in the model.
   bool ShouldShowKeywordBubble() const;
 
   // Returns true if any of the following is true: