Straighten up keyboard hide and show logic

content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java

Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
index 20ad2219232b2a17aad95c20c957f4992391b1fa..b604f87635287be827bb4bc988f146f9b898fcf2 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java
@@ -10,6 +10,7 @@ import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 
+import org.chromium.base.Log;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.input.InputMethodManagerWrapper;
 
@@ -17,6 +18,8 @@ import org.chromium.content.browser.input.InputMethodManagerWrapper;
  * Overrides InputMethodManagerWrapper for testing purposes.
  */
 public class TestInputMethodManagerWrapper extends InputMethodManagerWrapper {
+    private static final String TAG = "cr_Ime";
+
     /**
      * A simple class to set start and end in int type.
      */
@@ -75,12 +78,14 @@ public class TestInputMethodManagerWrapper extends InputMethodManagerWrapper {
 
     public TestInputMethodManagerWrapper(ContentViewCore contentViewCore) {
         super(null);
+        Log.d(TAG, "TestInputMethodManagerWrapper constructor");
         mContentViewCore = contentViewCore;
     }
 
     @Override
     public void restartInput(View view) {
         mRestartInputCounter++;
+        Log.d(TAG, "restartInput: count [%d]", mRestartInputCounter);
         mEditorInfo = new EditorInfo();
         mInputConnection = mContentViewCore.onCreateInputConnection(mEditorInfo);
     }
@@ -89,6 +94,7 @@ public class TestInputMethodManagerWrapper extends InputMethodManagerWrapper {
     public void showSoftInput(View view, int flags, ResultReceiver resultReceiver) {
         mIsShowWithoutHideOutstanding = true;
         mShowSoftInputCounter++;
+        Log.d(TAG, "showSoftInput: count [%d]", mShowSoftInputCounter);
         if (mInputConnection != null) return;
         mEditorInfo = new EditorInfo();
         mInputConnection = mContentViewCore.onCreateInputConnection(mEditorInfo);
@@ -96,8 +102,9 @@ public class TestInputMethodManagerWrapper extends InputMethodManagerWrapper {
 
     @Override
     public boolean isActive(View view) {
-        if (mInputConnection == null) return false;
-        return true;
+        boolean result = mInputConnection != null;
+        Log.d(TAG, "isActive: returns [%b]", result);
+        return result;
     }
 
     @Override
@@ -105,6 +112,7 @@ public class TestInputMethodManagerWrapper extends InputMethodManagerWrapper {
             ResultReceiver resultReceiver) {
         mIsShowWithoutHideOutstanding = false;
         mHideSoftInputCounter++;
+        Log.d(TAG, "hideSoftInputFromWindow: count [%d]", mHideSoftInputCounter);
         boolean retVal = mInputConnection == null;
         mInputConnection = null;
         return retVal;
@@ -113,6 +121,7 @@ public class TestInputMethodManagerWrapper extends InputMethodManagerWrapper {
     @Override
     public void updateSelection(View view, int selStart, int selEnd,
             int candidatesStart, int candidatesEnd) {
+        Log.d(TAG, "updateSelection");
         mUpdateSelectionCounter++;
         mSelection.set(selStart, selEnd);
         mComposition.set(candidatesStart, candidatesEnd);
@@ -123,6 +132,7 @@ public class TestInputMethodManagerWrapper extends InputMethodManagerWrapper {
     }
 
     public int getShowSoftInputCounter() {
+        Log.d(TAG, "getShowSoftInputCounter: %d", mShowSoftInputCounter);
         return mShowSoftInputCounter;
     }
 
@@ -135,6 +145,7 @@ public class TestInputMethodManagerWrapper extends InputMethodManagerWrapper {
     }
 
     public void resetCounters() {
+        Log.d(TAG, "resetCounters");
         mRestartInputCounter = 0;
         mShowSoftInputCounter = 0;
         mHideSoftInputCounter = 0;