Refactor autocomplete-specific logic into a separate class

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

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.omnibox;
 
 import static org.chromium.chrome.browser.toolbar.ToolbarPhone.URL_FOCUS_CHANGE_ANIMATION_DURATION_MS;
 
 import android.Manifest;
 import android.animation.Animator;
@@ skipping 316 matching lines @@
                 // set the text to the suggestion again.
                 setUrlBarText("", null);
                 mUrlBar.setText(selectedItem.getSuggestion().getFillIntoEdit());
                 mSuggestionList.setSelection(0);
                 mUrlBar.setSelection(mUrlBar.getText().length());
                 return true;
             } else if (KeyNavigationUtil.isEnter(event)
                     && LocationBarLayout.this.getVisibility() == VISIBLE) {
                 UiUtils.hideKeyboard(mUrlBar);
                 mSuggestionSelectionInProgress = true;
-                final String urlText = mUrlBar.getQueryText();
+                final String urlText = mUrlBar.getTextWithAutocomplete();
                 if (mNativeInitialized) {
                     findMatchAndLoadUrl(urlText);
                 } else {
                     mDeferredNativeRunnables.add(new Runnable() {
                         @Override
                         public void run() {
                             findMatchAndLoadUrl(urlText);
                         }
                     });
                 }
@@ skipping 712 matching lines @@
                 });
             }
         }
 
         if (mNativeInitialized) {
             startZeroSuggest();
         } else {
             mDeferredNativeRunnables.add(new Runnable() {
                 @Override
                 public void run() {
-                    if (TextUtils.isEmpty(mUrlBar.getQueryText())) {
+                    if (TextUtils.isEmpty(mUrlBar.getTextWithAutocomplete())) {
                         startZeroSuggest();
                     }
                 }
             });
         }
 
         if (!hasFocus) {
             mHasStartedNewOmniboxEditSession = false;
             mNewOmniboxEditSessionTimestamp = -1;
         }
@@ skipping 27 matching lines @@
      * - The current tab is not incognito.
      * - Chrome Home is disabled.
      */
     private void startZeroSuggest() {
         // Reset "edited" state in the omnibox if zero suggest is triggered -- new edits
         // now count as a new session.
         mHasStartedNewOmniboxEditSession = false;
         mNewOmniboxEditSessionTimestamp = -1;
         Tab currentTab = getCurrentTab();
         if (mNativeInitialized && mUrlHasFocus && currentTab != null) {
-            mAutocomplete.startZeroSuggest(currentTab.getProfile(), mUrlBar.getQueryText(),
-                    mToolbarDataProvider.getCurrentUrl(), mUrlFocusedFromFakebox);
+            mAutocomplete.startZeroSuggest(currentTab.getProfile(),
+                    mUrlBar.getTextWithAutocomplete(), mToolbarDataProvider.getCurrentUrl(),
+                    mUrlFocusedFromFakebox);
         }
     }
 
     @Override
     public void onTextChangedForAutocomplete(final boolean textDeleted) {
         cancelPendingAutocompleteStart();
 
         updateButtonVisibility();
         updateNavigationButton();
 
@@ skipping 756 matching lines @@
      * Whether {@code v} is a view (location icon, verbose status, ...) which can be clicked to
      * show the Page Info popup.
      */
     private boolean shouldShowPageInfoForView(View v) {
         return v == mSecurityButton || v == mNavigationButton || v == mVerboseStatusTextView;
     }
 
     @Override
     public void onClick(View v) {
         if (v == mDeleteButton) {
-            if (!TextUtils.isEmpty(mUrlBar.getQueryText())) {
+            if (!TextUtils.isEmpty(mUrlBar.getTextWithAutocomplete())) {
                 setUrlBarText("", null);
                 hideSuggestions();
                 updateButtonVisibility();
             }
 
             startZeroSuggest();
             return;
         } else if (!mUrlHasFocus && shouldShowPageInfoForView(v)) {
             Tab currentTab = getCurrentTab();
             if (currentTab != null && currentTab.getWebContents() != null) {
@@ skipping 604 matching lines @@
     public void setTitleToPageTitle() { }
 
     @Override
     public void setShowTitle(boolean showTitle) { }
 
     @Override
     public boolean mustQueryUrlBarLocationForSuggestions() {
         return DeviceFormFactor.isTablet();
     }
 }