Move Omnibox suggestion classes to subpackage of omnibox.

NOPRESUBMIT=true
BUG=843596

Change-Id: I08316abfd1e7be7427337538c722716a0737048f
Reviewed-on: https://chromium-review.googlesource.com/c/1279184
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599707}

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

@@ -103,7 +103,7 @@ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.ntp.NewTabPageUma;
 import org.chromium.chrome.browser.omaha.OmahaBase;
-import org.chromium.chrome.browser.omnibox.AutocompleteController;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController;
 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;

chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java

@@ -39,7 +39,7 @@ import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
 import org.chromium.chrome.browser.externalnav.IntentWithGesturesHandler;
 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
-import org.chromium.chrome.browser.omnibox.AutocompleteController;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController;
 import org.chromium.chrome.browser.rappor.RapporServiceBridge;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.tab.Tab;

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

@@ -160,7 +160,7 @@ public interface LocationBar extends UrlBarDelegate {
     void updateMicButtonState();
 
     /**
-     * Signal to the {@link SuggestionView} populated by us.
+     * Signal to hide the omnibox suggestions.
      */
     void hideSuggestions();
 

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

@@ -53,10 +53,14 @@ import org.chromium.chrome.browser.native_page.NativePageFactory;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.ntp.NewTabPage.FakeboxDelegate;
 import org.chromium.chrome.browser.ntp.NewTabPageUma;
-import org.chromium.chrome.browser.omnibox.AutocompleteCoordinator.AutocompleteDelegate;
 import org.chromium.chrome.browser.omnibox.UrlBar.ScrollType;
 import org.chromium.chrome.browser.omnibox.UrlBarCoordinator.SelectionState;
 import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator.AutocompleteDelegate;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsList;
 import org.chromium.chrome.browser.page_info.PageInfoController;
 import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;

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

@@ -18,6 +18,8 @@ import android.text.TextUtils;
 import org.chromium.base.metrics.CachedMetrics;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.omnibox.VoiceSuggestionProvider.VoiceResult;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;

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

@@ -8,7 +8,9 @@ import android.os.Bundle;
 import android.speech.RecognizerIntent;
 
 import org.chromium.base.VisibleForTesting;
-import org.chromium.chrome.browser.omnibox.OmniboxSuggestion.MatchClassification;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion.MatchClassification;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 
 import java.util.ArrayList;

chrome/android/java/src/org/chromium/chrome/browser/omnibox/AnswerTextBuilder.java → chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AnswerTextBuilder.java

@@ -2,7 +2,7 @@
 // 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;
+package org.chromium.chrome.browser.omnibox.suggestions;
 
 import android.content.res.Resources;
 import android.graphics.Paint;
@@ -139,11 +139,11 @@ class AnswerTextBuilder {
      *                aligned text.
      * @param density Screen density which will be used to properly size and layout images and top-
      *                aligned text.
-    */
-    @SuppressWarnings("deprecation")  // Update usage of Html.fromHtml when API min is 24
-    private static void appendAndStyleText(
-            SpannableStringBuilder builder, SuggestionAnswer.TextField textField,
-            int maxTextHeightSp, Paint.FontMetrics metrics, float density) {
+     */
+    @SuppressWarnings("deprecation") // Update usage of Html.fromHtml when API min is 24
+    private static void appendAndStyleText(SpannableStringBuilder builder,
+            SuggestionAnswer.TextField textField, int maxTextHeightSp, Paint.FontMetrics metrics,
+            float density) {
         String text = textField.getText();
         int type = textField.getType();
 
@@ -163,9 +163,8 @@ class AnswerTextBuilder {
         builder.setSpan(colorSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 
         if (type == ANSWERS_TOP_ALIGNED_TEXT_TYPE) {
-            TopAlignedSpan topAlignedSpan =
-                    new TopAlignedSpan(
-                            ANSWERS_TOP_ALIGNED_TEXT_SIZE_SP, maxTextHeightSp, metrics, density);
+            TopAlignedSpan topAlignedSpan = new TopAlignedSpan(
+                    ANSWERS_TOP_ALIGNED_TEXT_SIZE_SP, maxTextHeightSp, metrics, density);
             builder.setSpan(topAlignedSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
     }
@@ -262,7 +261,7 @@ class AnswerTextBuilder {
             int textAscentPx = (int) (textHeightSp * ascentProportion * density);
             int maxTextAscentPx = (int) (maxTextHeightSp * ascentProportion * density);
 
-            this.mBaselineShift = -(maxTextAscentPx - textAscentPx);  // Up is -y.
+            this.mBaselineShift = -(maxTextAscentPx - textAscentPx); // Up is -y.
         }
 
         @Override

chrome/android/java/src/org/chromium/chrome/browser/omnibox/AnswersImage.java → chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AnswersImage.java

@@ -2,7 +2,7 @@
 // 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;
+package org.chromium.chrome.browser.omnibox.suggestions;
 
 import android.graphics.Bitmap;
 
@@ -20,7 +20,7 @@ public class AnswersImage {
         /**
          * Called when the image is updated.
          *
-         * @param answersImage the image
+         * @param bitmap the image
          */
         @CalledByNative("AnswersImageObserver")
         public void onAnswersImageChanged(Bitmap bitmap);

chrome/android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteController.java → chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java

@@ -2,7 +2,7 @@
 // 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;
+package org.chromium.chrome.browser.omnibox.suggestions;
 
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -12,8 +12,10 @@ import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.WarmupManager;
 import org.chromium.chrome.browser.ntp.NewTabPage;
-import org.chromium.chrome.browser.omnibox.OmniboxSuggestion.MatchClassification;
+import org.chromium.chrome.browser.omnibox.OmniboxSuggestionType;
+import org.chromium.chrome.browser.omnibox.VoiceSuggestionProvider;
 import org.chromium.chrome.browser.omnibox.VoiceSuggestionProvider.VoiceResult;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion.MatchClassification;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.content_public.browser.WebContents;
 
@@ -37,7 +39,6 @@ public class AutocompleteController {
     private final OnSuggestionsReceivedListener mListener;
     private final VoiceSuggestionProvider mVoiceSuggestionProvider = new VoiceSuggestionProvider();
 
-
     private boolean mUseCachedZeroSuggestResults;
     private boolean mWaitingForSuggestionsToCache;
 
@@ -45,8 +46,8 @@ public class AutocompleteController {
      * Listener for receiving OmniboxSuggestions.
      */
     public static interface OnSuggestionsReceivedListener {
-        void onSuggestionsReceived(List<OmniboxSuggestion> suggestions,
-                String inlineAutocompleteText);
+        void onSuggestionsReceived(
+                List<OmniboxSuggestion> suggestions, String inlineAutocompleteText);
     }
 
     public AutocompleteController(OnSuggestionsReceivedListener listener) {
@@ -98,7 +99,7 @@ public class AutocompleteController {
      * @param url The URL of the current tab, used to suggest query refinements.
      * @param text The text to query autocomplete suggestions for.
      * @param cursorPosition The position of the cursor within the text.  Set to -1 if the cursor is
-     *                     not focussed on the text.
+     *                       not focused on the text.
      * @param preventInlineAutocomplete Whether autocomplete suggestions should be prevented.
      * @param focusedFromFakebox Whether the user entered the omnibox by tapping the fakebox on the
      *                           native NTP. This should be false on all other pages.
@@ -219,10 +220,8 @@ public class AutocompleteController {
     }
 
     @CalledByNative
-    protected void onSuggestionsReceived(
-            List<OmniboxSuggestion> suggestions,
-            String inlineAutocompleteText,
-            long currentNativeAutocompleteResult) {
+    protected void onSuggestionsReceived(List<OmniboxSuggestion> suggestions,
+            String inlineAutocompleteText, long currentNativeAutocompleteResult) {
         if (suggestions.size() > MAX_DEFAULT_SUGGESTION_COUNT) {
             // Trim to the default amount of normal suggestions we can have.
             suggestions.subList(MAX_DEFAULT_SUGGESTION_COUNT, suggestions.size()).clear();
@@ -289,18 +288,17 @@ public class AutocompleteController {
     }
 
     @CalledByNative
-    private static void addOmniboxSuggestionToList(List<OmniboxSuggestion> suggestionList,
-            OmniboxSuggestion suggestion) {
+    private static void addOmniboxSuggestionToList(
+            List<OmniboxSuggestion> suggestionList, OmniboxSuggestion suggestion) {
         suggestionList.add(suggestion);
     }
 
     @CalledByNative
-    private static OmniboxSuggestion buildOmniboxSuggestion(
-            int nativeType, boolean isSearchType, int relevance, int transition, String contents,
-            int[] contentClassificationOffsets, int[] contentClassificationStyles,
-            String description, int[] descriptionClassificationOffsets,
-            int[] descriptionClassificationStyles, String answerContents,
-            String answerType, String fillIntoEdit, String url,
+    private static OmniboxSuggestion buildOmniboxSuggestion(int nativeType, boolean isSearchType,
+            int relevance, int transition, String contents, int[] contentClassificationOffsets,
+            int[] contentClassificationStyles, String description,
+            int[] descriptionClassificationOffsets, int[] descriptionClassificationStyles,
+            String answerContents, String answerType, String fillIntoEdit, String url,
             boolean isStarred, boolean isDeletable) {
         assert contentClassificationOffsets.length == contentClassificationStyles.length;
         List<MatchClassification> contentClassifications = new ArrayList<>();
@@ -309,8 +307,7 @@ public class AutocompleteController {
                     contentClassificationOffsets[i], contentClassificationStyles[i]));
         }
 
-        assert descriptionClassificationOffsets.length
-                == descriptionClassificationStyles.length;
+        assert descriptionClassificationOffsets.length == descriptionClassificationStyles.length;
         List<MatchClassification> descriptionClassifications = new ArrayList<>();
         for (int i = 0; i < descriptionClassificationOffsets.length; i++) {
             descriptionClassifications.add(new MatchClassification(

chrome/android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteCoordinator.java → chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java

@@ -2,7 +2,7 @@
 // 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;
+package org.chromium.chrome.browser.omnibox.suggestions;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -24,12 +24,14 @@ import org.chromium.base.StrictModeContext;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.omnibox.AutocompleteController.OnSuggestionsReceivedListener;
-import org.chromium.chrome.browser.omnibox.OmniboxResultsAdapter.OmniboxResultItem;
-import org.chromium.chrome.browser.omnibox.OmniboxResultsAdapter.OmniboxSuggestionDelegate;
-import org.chromium.chrome.browser.omnibox.OmniboxSuggestionsList.OmniboxSuggestionListEmbedder;
+import org.chromium.chrome.browser.omnibox.OmniboxSuggestionType;
 import org.chromium.chrome.browser.omnibox.UrlBar.UrlTextChangeListener;
+import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider;
 import org.chromium.chrome.browser.omnibox.VoiceSuggestionProvider.VoiceResult;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController.OnSuggestionsReceivedListener;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxResultsAdapter.OmniboxResultItem;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxResultsAdapter.OmniboxSuggestionDelegate;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsList.OmniboxSuggestionListEmbedder;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;
 import org.chromium.chrome.browser.toolbar.ToolbarPhone;
@@ -96,7 +98,7 @@ public class AutocompleteCoordinator
     /**
      * Provides the additional functionality to trigger and interact with autocomplete suggestions.
      */
-    interface AutocompleteDelegate {
+    public interface AutocompleteDelegate {
         /**
          * Notified that the URL text has changed.
          */
@@ -269,7 +271,7 @@ public class AutocompleteCoordinator
      * @return The current native pointer to the autocomplete results.
      */
     // TODO(tedchoc): Figure out how to remove this.
-    long getCurrentNativeAutocompleteResult() {
+    public long getCurrentNativeAutocompleteResult() {
         return mAutocomplete.getCurrentNativeAutocompleteResult();
     }
 
@@ -461,7 +463,7 @@ public class AutocompleteCoordinator
     /**
      * Conditionally show the omnibox suggestions container.
      */
-    void maybeShowOmniboxResultsContainer() {
+    public void maybeShowOmniboxResultsContainer() {
         if (isSuggestionsListShown() || mDelegate.isUrlBarFocused()) {
             initOmniboxResultsContainer();
             updateOmniboxResultsContainerVisibility(true);
@@ -471,7 +473,7 @@ public class AutocompleteCoordinator
     /**
      * Update whether the omnibox suggestions container is visible.
      */
-    void updateOmniboxResultsContainerVisibility(boolean visible) {
+    public void updateOmniboxResultsContainerVisibility(boolean visible) {
         if (mOmniboxResultsContainer == null) return;
 
         boolean currentlyVisible = mOmniboxResultsContainer.getVisibility() == View.VISIBLE;
@@ -487,7 +489,7 @@ public class AutocompleteCoordinator
     /**
      * Update the layout direction of the suggestion list based on the parent layout direction.
      */
-    void updateSuggestionListLayoutDirection() {
+    public void updateSuggestionListLayoutDirection() {
         if (mSuggestionList == null) return;
         int layoutDirection = ViewCompat.getLayoutDirection(mParent);
         mSuggestionList.updateSuggestionsLayoutDirection(layoutDirection);
@@ -944,7 +946,7 @@ public class AutocompleteCoordinator
      * Cancels the queued task to start the autocomplete controller, if any.
      */
     @VisibleForTesting
-    void cancelPendingAutocompleteStart() {
+    public void cancelPendingAutocompleteStart() {
         if (mRequestSuggestions != null) {
             // There is a request for suggestions either waiting for the native side
             // to start, or on the message queue. Remove it from wherever it is.
@@ -958,7 +960,7 @@ public class AutocompleteCoordinator
     /**
      * Trigger autocomplete for the given query.
      */
-    void startAutocompleteForQuery(String query) {
+    public void startAutocompleteForQuery(String query) {
         stopAutocomplete(false);
         if (mToolbarDataProvider.hasTab()) {
             mAutocomplete.start(mToolbarDataProvider.getProfile(),
@@ -969,7 +971,7 @@ public class AutocompleteCoordinator
     /**
      * Notifies autocomplete that the URL focus state has changed.
      */
-    void onUrlFocusChanged(boolean hasFocus) {
+    public void onUrlFocusChanged(boolean hasFocus) {
         if (!hasFocus) {
             mHasStartedNewOmniboxEditSession = false;
             mNewOmniboxEditSessionTimestamp = -1;

chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxResultsAdapter.java → chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxResultsAdapter.java

@@ -2,7 +2,7 @@
 // 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;
+package org.chromium.chrome.browser.omnibox.suggestions;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -26,7 +26,6 @@ import java.util.Set;
  */
 @VisibleForTesting
 public class OmniboxResultsAdapter extends BaseAdapter {
-
     private final List<OmniboxResultItem> mSuggestionItems;
     private final Context mContext;
     private ToolbarDataProvider mDataProvider;
@@ -35,9 +34,7 @@ public class OmniboxResultsAdapter extends BaseAdapter {
     private Set<String> mPendingAnswerRequestUrls = new HashSet<>();
     private int mLayoutDirection;
 
-    public OmniboxResultsAdapter(
-            Context context,
-            List<OmniboxResultItem> suggestionItems) {
+    public OmniboxResultsAdapter(Context context, List<OmniboxResultItem> suggestionItems) {
         mContext = context;
         mSuggestionItems = suggestionItems;
     }

chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxSuggestion.java → chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestion.java

@@ -2,7 +2,7 @@
 // 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;
+package org.chromium.chrome.browser.omnibox.suggestions;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
@@ -10,6 +10,7 @@ import android.text.TextUtils;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.chrome.browser.omnibox.MatchClassificationStyle;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -173,7 +174,7 @@ public class OmniboxSuggestion {
 
     @Override
     public String toString() {
-        return mType + " relevance=" +  mRelevance + " \"" + mDisplayText + "\" -> " + mUrl;
+        return mType + " relevance=" + mRelevance + " \"" + mDisplayText + "\" -> " + mUrl;
     }
 
     @Override
@@ -194,17 +195,12 @@ public class OmniboxSuggestion {
 
         OmniboxSuggestion suggestion = (OmniboxSuggestion) obj;
 
-        boolean answersAreEqual =
-                (mAnswerContents == null && suggestion.mAnswerContents == null)
-                || (mAnswerContents != null
-                && suggestion.mAnswerContents != null
-                && mAnswerContents.equals(suggestion.mAnswerContents));
-        return mType == suggestion.mType
-                && mFillIntoEdit.equals(suggestion.mFillIntoEdit)
-                && mDisplayText.equals(suggestion.mDisplayText)
-                && answersAreEqual
-                && mIsStarred == suggestion.mIsStarred
-                && mIsDeletable == suggestion.mIsDeletable;
+        boolean answersAreEqual = (mAnswerContents == null && suggestion.mAnswerContents == null)
+                || (mAnswerContents != null && suggestion.mAnswerContents != null
+                           && mAnswerContents.equals(suggestion.mAnswerContents));
+        return mType == suggestion.mType && mFillIntoEdit.equals(suggestion.mFillIntoEdit)
+                && mDisplayText.equals(suggestion.mDisplayText) && answersAreEqual
+                && mIsStarred == suggestion.mIsStarred && mIsDeletable == suggestion.mIsDeletable;
     }
 
     /**
@@ -218,14 +214,12 @@ public class OmniboxSuggestion {
         for (int i = 0; i < suggestions.size(); i++) {
             OmniboxSuggestion suggestion = suggestions.get(i);
             editor.putString(KEY_PREFIX_ZERO_SUGGEST_URL + i, suggestion.getUrl())
-                    .putString(KEY_PREFIX_ZERO_SUGGEST_DISPLAY_TEST + i,
-                            suggestion.getDisplayText())
-                    .putString(KEY_PREFIX_ZERO_SUGGEST_DESCRIPTION + i,
-                            suggestion.getDescription())
-                    .putString(KEY_PREFIX_ZERO_SUGGEST_ANSWER_TEXT + i,
-                            suggestion.getAnswerContents())
-                    .putString(KEY_PREFIX_ZERO_SUGGEST_ANSWER_TYPE + i,
-                            suggestion.getAnswerType())
+                    .putString(
+                            KEY_PREFIX_ZERO_SUGGEST_DISPLAY_TEST + i, suggestion.getDisplayText())
+                    .putString(KEY_PREFIX_ZERO_SUGGEST_DESCRIPTION + i, suggestion.getDescription())
+                    .putString(
+                            KEY_PREFIX_ZERO_SUGGEST_ANSWER_TEXT + i, suggestion.getAnswerContents())
+                    .putString(KEY_PREFIX_ZERO_SUGGEST_ANSWER_TYPE + i, suggestion.getAnswerType())
                     .putInt(KEY_PREFIX_ZERO_SUGGEST_NATIVE_TYPE + i, suggestion.getType())
                     .putBoolean(KEY_PREFIX_ZERO_SUGGEST_IS_SEARCH_TYPE + i,
                             !suggestion.isUrlSuggestion())
@@ -256,11 +250,10 @@ public class OmniboxSuggestion {
                 boolean isSearchType =
                         prefs.getBoolean(KEY_PREFIX_ZERO_SUGGEST_IS_SEARCH_TYPE, true);
                 boolean isStarred = prefs.getBoolean(KEY_PREFIX_ZERO_SUGGEST_IS_STARRED + i, false);
-                boolean isDeletable = prefs.getBoolean(
-                        KEY_PREFIX_ZERO_SUGGEST_IS_DELETABLE + i, false);
-                OmniboxSuggestion suggestion = new OmniboxSuggestion(
-                        nativeType, !isSearchType, 0, 0, displayText,
-                        classifications, description, classifications, answerText,
+                boolean isDeletable =
+                        prefs.getBoolean(KEY_PREFIX_ZERO_SUGGEST_IS_DELETABLE + i, false);
+                OmniboxSuggestion suggestion = new OmniboxSuggestion(nativeType, !isSearchType, 0,
+                        0, displayText, classifications, description, classifications, answerText,
                         answerType, "", url, isStarred, isDeletable);
                 suggestions.add(suggestion);
             }

chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxSuggestionsList.java → chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsList.java

@@ -2,7 +2,7 @@
 // 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;
+package org.chromium.chrome.browser.omnibox.suggestions;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -20,7 +20,7 @@ import android.widget.ListView;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.WindowDelegate;
-import org.chromium.chrome.browser.omnibox.OmniboxResultsAdapter.OmniboxResultItem;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxResultsAdapter.OmniboxResultItem;
 import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
 

chrome/android/java/src/org/chromium/chrome/browser/omnibox/SuggestionAnswer.java → chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/SuggestionAnswer.java

@@ -2,7 +2,7 @@
 // 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;
+package org.chromium.chrome.browser.omnibox.suggestions;
 
 import android.util.Log;
 
@@ -21,7 +21,7 @@ import java.util.List;
  * referred to as "additional text" and "status text".  The image, if present, contains a single
  * string, which may be a URL or base64-encoded image data.
  *
- * When represented in the UI, these elements should be styled and layed out according to the
+ * When represented in the UI, these elements should be styled and laid out according to the
  * specification at http://goto.google.com/ais_api.
  */
 public class SuggestionAnswer {
@@ -40,8 +40,7 @@ public class SuggestionAnswer {
     private static final String ANSWERS_JSON_IMAGE_DATA = "d";
     private static final String ANSWERS_JSON_NUMBER_OF_LINES = "ln";
 
-    private SuggestionAnswer() {
-    }
+    private SuggestionAnswer() {}
 
     /**
      * Parses the JSON representation of an answer and constructs a SuggestionAnswer from the

chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java

@@ -26,7 +26,7 @@ import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.init.AsyncInitializationActivity;
 import org.chromium.chrome.browser.locale.LocaleManager;
-import org.chromium.chrome.browser.omnibox.AutocompleteController;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController;
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
 import org.chromium.chrome.browser.tab.Tab;

chrome/android/java_sources.gni

@@ -1044,10 +1044,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/omaha/VersionNumber.java",
   "java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java",
   "java/src/org/chromium/chrome/browser/omaha/XMLParser.java",
-  "java/src/org/chromium/chrome/browser/omnibox/AnswerTextBuilder.java",
-  "java/src/org/chromium/chrome/browser/omnibox/AnswersImage.java",
-  "java/src/org/chromium/chrome/browser/omnibox/AutocompleteController.java",
-  "java/src/org/chromium/chrome/browser/omnibox/AutocompleteCoordinator.java",
   "java/src/org/chromium/chrome/browser/omnibox/AutocompleteEditText.java",
   "java/src/org/chromium/chrome/browser/omnibox/AutocompleteEditTextModel.java",
   "java/src/org/chromium/chrome/browser/omnibox/AutocompleteEditTextModelBase.java",
@@ -1059,15 +1055,10 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java",
   "java/src/org/chromium/chrome/browser/omnibox/LocationBarVoiceRecognitionHandler.java",
   "java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java",
-  "java/src/org/chromium/chrome/browser/omnibox/OmniboxResultsAdapter.java",
-  "java/src/org/chromium/chrome/browser/omnibox/OmniboxSuggestion.java",
-  "java/src/org/chromium/chrome/browser/omnibox/OmniboxSuggestionsList.java",
   "java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java",
   "java/src/org/chromium/chrome/browser/omnibox/OmniboxViewUtil.java",
   "java/src/org/chromium/chrome/browser/omnibox/QueryInOmnibox.java",
   "java/src/org/chromium/chrome/browser/omnibox/SpannableAutocompleteEditTextModel.java",
-  "java/src/org/chromium/chrome/browser/omnibox/SuggestionAnswer.java",
-  "java/src/org/chromium/chrome/browser/omnibox/SuggestionView.java",
   "java/src/org/chromium/chrome/browser/omnibox/UrlBar.java",
   "java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java",
   "java/src/org/chromium/chrome/browser/omnibox/UrlBarData.java",
@@ -1082,6 +1073,15 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/omnibox/geo/PlatformNetworksManager.java",
   "java/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworks.java",
   "java/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTracker.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/AnswerTextBuilder.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/AnswersImage.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxResultsAdapter.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestion.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsList.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/SuggestionAnswer.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/SuggestionView.java",
   "java/src/org/chromium/chrome/browser/page_info/CertificateChainHelper.java",
   "java/src/org/chromium/chrome/browser/page_info/CertificateViewer.java",
   "java/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopup.java",
@@ -1972,10 +1972,10 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/omnibox/LocationBarVoiceRecognitionHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java",
   "javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java",
-  "javatests/src/org/chromium/chrome/browser/omnibox/SuggestionAnswerTest.java",
   "javatests/src/org/chromium/chrome/browser/omnibox/UrlBarTest.java",
   "javatests/src/org/chromium/chrome/browser/omnibox/VoiceSuggestionProviderTest.java",
   "javatests/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java",
+  "javatests/src/org/chromium/chrome/browser/omnibox/suggestions/SuggestionAnswerTest.java",
   "javatests/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopupTest.java",
   "javatests/src/org/chromium/chrome/browser/page_info/PageInfoControllerTest.java",
   "javatests/src/org/chromium/chrome/browser/partnercustomizations/BasePartnerBrowserCustomizationIntegrationTestRule.java",

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/LocationBarVoiceRecognitionHandlerTest.java

@@ -25,9 +25,12 @@ import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.ntp.NewTabPage;
-import org.chromium.chrome.browser.omnibox.AutocompleteController.OnSuggestionsReceivedListener;
 import org.chromium.chrome.browser.omnibox.LocationBarVoiceRecognitionHandler.VoiceInteractionSource;
 import org.chromium.chrome.browser.omnibox.VoiceSuggestionProvider.VoiceResult;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController.OnSuggestionsReceivedListener;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java

@@ -41,7 +41,10 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ChromeSwitches;
-import org.chromium.chrome.browser.omnibox.AutocompleteController.OnSuggestionsReceivedListener;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController.OnSuggestionsReceivedListener;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsList;
+import org.chromium.chrome.browser.omnibox.suggestions.SuggestionView;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabObserver;

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/UrlBarTest.java

@@ -39,6 +39,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/VoiceSuggestionProviderTest.java

@@ -19,8 +19,9 @@ import org.junit.runner.RunWith;
 
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.browser.omnibox.OmniboxSuggestion.MatchClassification;
 import org.chromium.chrome.browser.omnibox.VoiceSuggestionProvider.VoiceResult;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion.MatchClassification;
 import org.chromium.chrome.browser.test.ChromeBrowserTestRule;
 
 import java.util.ArrayList;

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/SuggestionAnswerTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/suggestions/SuggestionAnswerTest.java

@@ -2,7 +2,7 @@
 // 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;
+package org.chromium.chrome.browser.omnibox.suggestions;
 
 import android.support.test.filters.SmallTest;
 

chrome/android/javatests/src/org/chromium/chrome/browser/searchwidget/SearchActivityTest.java

@@ -36,9 +36,9 @@ import org.chromium.chrome.browser.locale.DefaultSearchEnginePromoDialog;
 import org.chromium.chrome.browser.locale.DefaultSearchEnginePromoDialog.DefaultSearchEnginePromoDialogObserver;
 import org.chromium.chrome.browser.locale.LocaleManager;
 import org.chromium.chrome.browser.omnibox.MatchClassificationStyle;
-import org.chromium.chrome.browser.omnibox.OmniboxSuggestion;
-import org.chromium.chrome.browser.omnibox.OmniboxSuggestion.MatchClassification;
 import org.chromium.chrome.browser.omnibox.UrlBar;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion.MatchClassification;
 import org.chromium.chrome.browser.search_engines.TemplateUrl;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.searchwidget.SearchActivity.SearchActivityDelegate;

chrome/browser/BUILD.gn

@@ -4746,13 +4746,13 @@ if (is_android) {
       "../android/java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskScheduler.java",
       "../android/java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchConfiguration.java",
       "../android/java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchedPagesNotifier.java",
-      "../android/java/src/org/chromium/chrome/browser/omnibox/AnswersImage.java",
-      "../android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteController.java",
       "../android/java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java",
       "../android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java",
       "../android/java/src/org/chromium/chrome/browser/omnibox/OmniboxViewUtil.java",
       "../android/java/src/org/chromium/chrome/browser/omnibox/QueryInOmnibox.java",
       "../android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeader.java",
+      "../android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AnswersImage.java",
+      "../android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java",
       "../android/java/src/org/chromium/chrome/browser/page_info/CertificateChainHelper.java",
       "../android/java/src/org/chromium/chrome/browser/page_info/CertificateViewer.java",
       "../android/java/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopup.java",

chrome/test/android/javatests/src/org/chromium/chrome/test/util/OmniboxTestUtils.java

@@ -11,14 +11,14 @@ import android.view.inputmethod.InputMethodManager;
 import org.junit.Assert;
 
 import org.chromium.base.ThreadUtils;
-import org.chromium.chrome.browser.omnibox.AutocompleteController;
-import org.chromium.chrome.browser.omnibox.AutocompleteController.OnSuggestionsReceivedListener;
 import org.chromium.chrome.browser.omnibox.LocationBarLayout;
 import org.chromium.chrome.browser.omnibox.MatchClassificationStyle;
-import org.chromium.chrome.browser.omnibox.OmniboxSuggestion;
-import org.chromium.chrome.browser.omnibox.OmniboxSuggestion.MatchClassification;
-import org.chromium.chrome.browser.omnibox.OmniboxSuggestionsList;
 import org.chromium.chrome.browser.omnibox.UrlBar;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController.OnSuggestionsReceivedListener;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion.MatchClassification;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsList;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;