Refactor ContentViewClient (2/6)

content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java

Index: content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
diff --git a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
index 23675f990603955a28db12d66afaa65c8b28d943..bb74beef64bfb3d3358d6fbcc7cfccda5446b1ff 100644
--- a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
+++ b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
@@ -27,6 +27,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_shell.Shell;
+import org.chromium.ui.base.WindowAndroid;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -98,6 +99,13 @@ public class ContentShellTestBase
         return getActivity().getActiveShell().getWebContents();
     }
 
+     /**
+     * Return the WindowAndroid of this shell.
+     */
+    protected WindowAndroid getWindowAndroid() {
+        return getActivity().getWindowAndroid();
+    }
+
     /**
      * Waits for the Active shell to finish loading.  This times out after
      * WAIT_FOR_ACTIVE_SHELL_LOADING_TIMEOUT milliseconds and it shouldn't be used for long