[ToolbarMVC] Move allowKeyboardLearning to LocationBarMediator

Bug: 1147581
Change-Id: I2003662a67825bd842389fb4d8c9f03c9071f2fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2552990
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Reviewed-by: Filip Gorski <fgorski@chromium.org>
Reviewed-by: Patrick Noland <pnoland@chromium.org>
Reviewed-by: bttk <bttk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834996}

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

@@ -382,11 +382,6 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener {
         return tab.getView();
     }
 
-    public boolean allowKeyboardLearning() {
-        if (mLocationBarDataProvider == null) return false;
-        return !mLocationBarDataProvider.isIncognito();
-    }
-
     /* package */ void setUrlBarFocus(
             boolean shouldBeFocused, @Nullable String pastedText, @OmniboxFocusReason int reason) {
         if (shouldBeFocused) {

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

@@ -436,7 +436,8 @@ class LocationBarMediator implements LocationBarDataProvider.Observer, FakeboxDe
 
     @Override
     public boolean allowKeyboardLearning() {
-        return mLocationBarLayout.allowKeyboardLearning();
+        assert mLocationBarDataProvider != null;
+        return !mLocationBarDataProvider.isIncognito();
     }
 
     @Override

chrome/android/junit/src/org/chromium/chrome/browser/omnibox/LocationBarMediatorTest.java

@@ -4,6 +4,9 @@
 
 package org.chromium.chrome.browser.omnibox;
 
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -237,4 +240,13 @@ public class LocationBarMediatorTest {
                 .willHandleLoadUrlWithPostData(TEST_URL, PageTransition.TYPED, null, null, false);
         verify(mTab, times(0)).loadUrl(any());
     }
+
+    @Test
+    public void testAllowKeyboardLearning() {
+        doReturn(false).when(mLocationBarDataProvider).isIncognito();
+        assertTrue(mMediator.allowKeyboardLearning());
+
+        doReturn(true).when(mLocationBarDataProvider).isIncognito();
+        assertFalse(mMediator.allowKeyboardLearning());
+    }
 }