Refactor autocomplete-specific logic into a separate class

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/UrlBarTest.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.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
 
 import android.annotation.SuppressLint;
 import android.content.ClipData;
@@ skipping 103 matching lines @@
             final UrlBar urlBar, final Runnable action) {
         final AtomicBoolean hasAutocomplete = new AtomicBoolean();
         final AtomicReference<String> textWithoutAutocomplete = new AtomicReference<String>();
         final AtomicReference<String> textWithAutocomplete = new AtomicReference<String>();
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 if (action != null) action.run();
                 textWithoutAutocomplete.set(urlBar.getTextWithoutAutocomplete());
-                textWithAutocomplete.set(urlBar.getQueryText());
+                textWithAutocomplete.set(urlBar.getTextWithAutocomplete());
                 hasAutocomplete.set(urlBar.hasAutocomplete());
             }
         });
 
         return new AutocompleteState(
                 hasAutocomplete.get(), textWithoutAutocomplete.get(), textWithAutocomplete.get());
     }
 
     private void setTextAndVerifyNoAutocomplete(final UrlBar urlBar, final String text) {
         AutocompleteState state = getAutocompleteState(urlBar, new Runnable() {
@@ skipping 349 matching lines @@
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 urlBar.beginBatchEdit();
             }
         });
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                urlBar.mInputConnection.commitText("y", 1);
+                urlBar.getInputConnection().commitText("y", 1);
             }
         });
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 urlBar.endBatchEdit();
             }
         });
 
         CriteriaHelper.pollUiThread(Criteria.equals("testy", new Callable<String>() {
@@ skipping 91 matching lines @@
         final UrlBar urlBar = getUrlBar();
         OmniboxTestUtils.toggleUrlBarFocus(urlBar, true);
         OmniboxTestUtils.waitForFocusAndKeyboardActive(urlBar, true);
 
         setTextAndVerifyNoAutocomplete(urlBar, "a");
         setAutocomplete(urlBar, "a", "mazon.com");
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                urlBar.mInputConnection.beginBatchEdit();
-                urlBar.mInputConnection.commitText("l", 1);
-                urlBar.mInputConnection.setComposingText("", 1);
-                urlBar.mInputConnection.endBatchEdit();
+                urlBar.getInputConnection().beginBatchEdit();
+                urlBar.getInputConnection().commitText("l", 1);
+                urlBar.getInputConnection().setComposingText("", 1);
+                urlBar.getInputConnection().endBatchEdit();
             }
         });
 
         CriteriaHelper.pollUiThread(Criteria.equals("al", new Callable<String>() {
             @Override
             public String call() {
                 return urlBar.getText().toString();
             }
         }));
     }
@@ skipping 24 matching lines @@
             throws InterruptedException, ExecutionException {
         mActivityTestRule.startMainActivityOnBlankPage();
         stubLocationBarAutocomplete();
         final UrlBar urlBar = getUrlBar();
         OmniboxTestUtils.toggleUrlBarFocus(urlBar, true);
         OmniboxTestUtils.waitForFocusAndKeyboardActive(urlBar, true);
 
         setTextAndVerifyNoAutocomplete(urlBar, "test");
         setAutocomplete(urlBar, "test", "ing is fun");
 
-        Assert.assertNotNull(urlBar.mInputConnection);
+        Assert.assertNotNull(urlBar.getInputConnection());
         AutocompleteState state = getAutocompleteState(urlBar, new Runnable() {
             @Override
             public void run() {
-                urlBar.mInputConnection.setComposingText("ing compose", 4);
+                urlBar.getInputConnection().setComposingText("ing compose", 4);
             }
         });
         Assert.assertFalse(state.hasAutocomplete);
 
         Editable urlText = getUrlBarText(urlBar);
         Assert.assertEquals("testing compose", urlText.toString());
         // TODO(tedchoc): Investigate why this fails on x86.
         //assertEquals(4, BaseInputConnection.getComposingSpanStart(urlText));
         //assertEquals(15, BaseInputConnection.getComposingSpanEnd(urlText));
     }
 
     @Test
     @SmallTest
     @Feature("Omnibox")
     @RetryOnFailure
     @Restriction({RESTRICTION_TYPE_NON_LOW_END_DEVICE}) // crbug.com/635714
     public void testDelayedCompositionCorrectedWithAutocomplete()
             throws InterruptedException, ExecutionException {
         mActivityTestRule.startMainActivityOnBlankPage();
         stubLocationBarAutocomplete();
 
         final UrlBar urlBar = getUrlBar();
         OmniboxTestUtils.toggleUrlBarFocus(urlBar, true);
         OmniboxTestUtils.waitForFocusAndKeyboardActive(urlBar, true);
 
-        Assert.assertNotNull(urlBar.mInputConnection);
+        Assert.assertNotNull(urlBar.getInputConnection());
 
         // Test with a single autocomplete
 
         setTextAndVerifyNoAutocomplete(urlBar, "chrome://f");
         setAutocomplete(urlBar, "chrome://f", "lags");
 
         AutocompleteState state = getAutocompleteState(urlBar, new Runnable() {
             @Override
             public void run() {
-                urlBar.mInputConnection.setComposingRegion(13, 14);
-                urlBar.mInputConnection.setComposingText("f", 1);
+                urlBar.getInputConnection().setComposingRegion(13, 14);
+                urlBar.getInputConnection().setComposingText("f", 1);
             }
         });
         Assert.assertFalse(state.hasAutocomplete);
 
         Editable urlText = getUrlBarText(urlBar);
         Assert.assertEquals("chrome://f", urlText.toString());
         Assert.assertEquals(BaseInputConnection.getComposingSpanStart(urlText), 9);
         Assert.assertEquals(BaseInputConnection.getComposingSpanEnd(urlText), 10);
 
         // Test with > 1 characters in composition.
 
         setTextAndVerifyNoAutocomplete(urlBar, "chrome://fl");
         setAutocomplete(urlBar, "chrome://fl", "ags");
 
         state = getAutocompleteState(urlBar, new Runnable() {
             @Override
             public void run() {
-                urlBar.mInputConnection.setComposingRegion(12, 14);
-                urlBar.mInputConnection.setComposingText("fl", 1);
+                urlBar.getInputConnection().setComposingRegion(12, 14);
+                urlBar.getInputConnection().setComposingText("fl", 1);
             }
         });
         Assert.assertFalse(state.hasAutocomplete);
 
         urlText = getUrlBarText(urlBar);
         Assert.assertEquals("chrome://fl", urlText.toString());
         Assert.assertEquals(BaseInputConnection.getComposingSpanStart(urlText), 9);
         Assert.assertEquals(BaseInputConnection.getComposingSpanEnd(urlText), 11);
 
         // Test with non-matching composition.  Should just append to the URL text.
 
         setTextAndVerifyNoAutocomplete(urlBar, "chrome://f");
         setAutocomplete(urlBar, "chrome://f", "lags");
 
         state = getAutocompleteState(urlBar, new Runnable() {
             @Override
             public void run() {
-                urlBar.mInputConnection.setComposingRegion(13, 14);
-                urlBar.mInputConnection.setComposingText("g", 1);
+                urlBar.getInputConnection().setComposingRegion(13, 14);
+                urlBar.getInputConnection().setComposingText("g", 1);
             }
         });
         Assert.assertFalse(state.hasAutocomplete);
 
         urlText = getUrlBarText(urlBar);
         Assert.assertEquals("chrome://fg", urlText.toString());
         Assert.assertEquals(BaseInputConnection.getComposingSpanStart(urlText), 10);
         Assert.assertEquals(BaseInputConnection.getComposingSpanEnd(urlText), 11);
 
         // Test with composition text that matches the entire text w/o autocomplete.
 
         setTextAndVerifyNoAutocomplete(urlBar, "chrome://f");
         setAutocomplete(urlBar, "chrome://f", "lags");
 
         state = getAutocompleteState(urlBar, new Runnable() {
             @Override
             public void run() {
-                urlBar.mInputConnection.setComposingRegion(13, 14);
-                urlBar.mInputConnection.setComposingText("chrome://f", 1);
+                urlBar.getInputConnection().setComposingRegion(13, 14);
+                urlBar.getInputConnection().setComposingText("chrome://f", 1);
             }
         });
         Assert.assertFalse(state.hasAutocomplete);
 
         urlText = getUrlBarText(urlBar);
         Assert.assertEquals("chrome://f", urlText.toString());
         Assert.assertEquals(BaseInputConnection.getComposingSpanStart(urlText), 0);
         Assert.assertEquals(BaseInputConnection.getComposingSpanEnd(urlText), 10);
 
         // Test with composition text longer than the URL text.  Shouldn't crash and should
         // just append text.
 
         setTextAndVerifyNoAutocomplete(urlBar, "chrome://f");
         setAutocomplete(urlBar, "chrome://f", "lags");
 
         state = getAutocompleteState(urlBar, new Runnable() {
             @Override
             public void run() {
-                urlBar.mInputConnection.setComposingRegion(13, 14);
-                urlBar.mInputConnection.setComposingText("blahblahblah", 1);
+                urlBar.getInputConnection().setComposingRegion(13, 14);
+                urlBar.getInputConnection().setComposingText("blahblahblah", 1);
             }
         });
         Assert.assertFalse(state.hasAutocomplete);
 
         urlText = getUrlBarText(urlBar);
         Assert.assertEquals("chrome://fblahblahblah", urlText.toString());
         Assert.assertEquals(BaseInputConnection.getComposingSpanStart(urlText), 10);
         Assert.assertEquals(BaseInputConnection.getComposingSpanEnd(urlText), 22);
     }
 
@@ skipping 60 matching lines @@
                 return text != null ? text.toString() : null;
             }
         });
     }
 
     @Before
     public void setUp() throws InterruptedException {
         // Each test will start the activity.
     }
 }