Don't highlight https when displaying search terms in omnibox.

When searching for https:// with query in omnibox enabled, https was
highlighted green as it would be for a standard URL. This fix disables
URL emphasis when displaying search terms.

Bug: 824971
Change-Id: Ibaf1a996931c861697263cbabbf6b65e235076f5
Reviewed-on: https://chromium-review.googlesource.com/976864Reviewed-by: Maria Khomenko <mariakhomenko@chromium.org>
Commit-Queue: Troy Hildebrandt <thildebr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545498}

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

@@ -1400,6 +1400,7 @@ public class LocationBarLayout extends FrameLayout
     }
 
     private void emphasizeUrl() {
+        if (mToolbarDataProvider.isDisplayingQueryTerms()) return;
         mUrlBar.emphasizeUrl();
     }