Do not dismiss keyboard if Activity reports no active views.

This change prevents the NPE caused during keyboard hide if Activity
reported no active views.

Bug: 1165666
Change-Id: Id84248305b8d38a6c2f668e540ae08855822b1c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2625813
Commit-Queue: Tomasz Wiszkowski <ender@google.com>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842800}

chrome/android/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonMediator.java

@@ -9,6 +9,7 @@ import android.animation.AnimatorSet;
 import android.app.Activity;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
+import android.view.View;
 
 import androidx.annotation.Nullable;
 
@@ -120,8 +121,13 @@ class MenuButtonMediator implements AppMenuObserver {
             // Defocus here to avoid handling focus in multiple places, e.g., when the
             // forward button is pressed. (see crbug.com/414219)
             mSetUrlBarFocusFunction.setFocus(false, OmniboxFocusReason.UNFOCUS);
-            // Dismiss keyboard in case the user was interacting with an input field on a website.
-            mKeyboardDelegate.hideKeyboard(mActivity.getCurrentFocus());
+
+            View view = mActivity.getCurrentFocus();
+            if (view != null) {
+                // Dismiss keyboard in case the user was interacting with an input field on a
+                // website.
+                mKeyboardDelegate.hideKeyboard(view);
+            }
 
             if (!mIsInOverviewModeSupplier.get() && isShowingAppMenuUpdateBadge()) {
                 // The app menu badge should be removed the first time the menu is opened.

chrome/android/junit/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButtonMediatorTest.java

@@ -9,11 +9,13 @@ import static junit.framework.Assert.assertTrue;
 
 import static org.mockito.Mockito.anyObject;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
 import android.app.Activity;
 import android.content.res.Resources;
+import android.view.View;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -71,6 +73,8 @@ public class MenuButtonMediatorTest {
     private WindowAndroid mWindowAndroid;
     @Mock
     private KeyboardVisibilityDelegate mKeyboardDelegate;
+    @Mock
+    private View mUtilityView;
 
     private UpdateMenuItemHelper.MenuUiState mMenuUiState;
     private OneshotSupplierImpl<AppMenuCoordinator> mAppMenuSupplier;
@@ -217,7 +221,15 @@ public class MenuButtonMediatorTest {
 
     @Test
     public void testKeyboardIsDismissedWhenMenuShows() {
+        doReturn(mUtilityView).when(mActivity).getCurrentFocus();
+        mMenuButtonMediator.onMenuVisibilityChanged(true);
+        verify(mKeyboardDelegate).hideKeyboard(eq(mUtilityView));
+    }
+
+    @Test
+    public void testKeyboardIsNotDismissedWhenMenuShowsWithNoFocusedViews() {
+        doReturn(null).when(mActivity).getCurrentFocus();
         mMenuButtonMediator.onMenuVisibilityChanged(true);
-        verify(mKeyboardDelegate).hideKeyboard(anyObject());
+        verify(mKeyboardDelegate, never()).hideKeyboard(anyObject());
     }
 }