Revert 291359 "Hide PopupZoomer when the container view or windo..."

trunk/src/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Index: trunk/src/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
===================================================================
--- trunk/src/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java	(revision 291364)
+++ trunk/src/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java	(working copy)
@@ -521,7 +521,9 @@
                 new ImeAdapter.ImeAdapterDelegate() {
                     @Override
                     public void onImeEvent() {
-                        mPopupZoomer.hide(true);
+                        if (mPopupZoomer.isShowing()) {
+                            mPopupZoomer.hide(true);
+                        }
                         getContentViewClient().onImeEvent();
                         hideTextHandles();
                     }
@@ -752,11 +754,6 @@
         mPopupZoomer.setOnTapListener(listener);
     }
 
-    @VisibleForTesting
-    public void setPopupZoomerForTest(PopupZoomer popupZoomer) {
-        mPopupZoomer = popupZoomer;
-    }
-
     /**
      * Destroy the internal state of the ContentView. This method may only be
      * called after the ContentView has been removed from the view system. No
@@ -1433,7 +1430,6 @@
         hidePastePopup();
         hideSelectPopup();
         hideTextHandles();
-        mPopupZoomer.hide(false);
     }
 
     public void hideSelectActionBar() {
@@ -1627,7 +1623,6 @@
             cancelRequestToScrollFocusedEditableNodeIntoView();
             hidePastePopup();
             hideTextHandles();
-            mPopupZoomer.hide(false);
         }
         if (mNativeContentViewCore != 0) nativeSetFocus(mNativeContentViewCore, gainFocus);
     }