Add way to reload the page, ignoring the cache

content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
-import org.chromium.content.browser.JavascriptInterface;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
  * Part of the test suite for the Java Bridge. Tests a number of features including ...
@@ skipping 77 matching lines @@
     protected void injectObjectAndReload(final Object object, final String name,
             final Class<? extends Annotation> requiredAnnotation) throws Throwable {
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mTestCallbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = onPageFinishedHelper.getCallCount();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 getContentView().getContentViewCore().addPossiblyUnsafeJavascriptInterface(object,
                         name, requiredAnnotation);
-                getContentView().reload();
+                getContentView().getContentViewCore().reload(true);
             }
         });
         onPageFinishedHelper.waitForCallback(currentCallCount);
     }
 
     // Note that this requires that we can pass a JavaScript boolean to Java.
     private void assertRaisesException(String script) throws Throwable {
         executeJavaScript("try {" +
                           script + ";" +
                           "  testController.setBooleanValue(false);" +
@@ skipping 20 matching lines @@
                         new Object(), "testObject", null);
             }
         });
         assertEquals("undefined", executeJavaScriptAndGetStringResult("typeof testObject"));
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mTestCallbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = onPageFinishedHelper.getCallCount();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                getContentView().reload();
+                getContentView().getContentViewCore().reload(true);
             }
         });
         onPageFinishedHelper.waitForCallback(currentCallCount);
         assertEquals("object", executeJavaScriptAndGetStringResult("typeof testObject"));
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testRemovalNotReflectedUntilReload() throws Throwable {
         injectObjectAndReload(new Object(), "testObject");
         assertEquals("object", executeJavaScriptAndGetStringResult("typeof testObject"));
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 getContentView().getContentViewCore().removeJavascriptInterface("testObject");
             }
         });
         assertEquals("object", executeJavaScriptAndGetStringResult("typeof testObject"));
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mTestCallbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = onPageFinishedHelper.getCallCount();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                getContentView().reload();
+                getContentView().getContentViewCore().reload(true);
             }
         });
         onPageFinishedHelper.waitForCallback(currentCallCount);
         assertEquals("undefined", executeJavaScriptAndGetStringResult("typeof testObject"));
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testRemoveObjectNotAdded() throws Throwable {
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mTestCallbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = onPageFinishedHelper.getCallCount();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 getContentView().getContentViewCore().removeJavascriptInterface("foo");
-                getContentView().reload();
+                getContentView().getContentViewCore().reload(true);
             }
         });
         onPageFinishedHelper.waitForCallback(currentCallCount);
         assertEquals("undefined", executeJavaScriptAndGetStringResult("typeof foo"));
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testTypeOfMethod() throws Throwable {
         assertEquals("function",
@@ skipping 114 matching lines @@
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testObjectPersistsAcrossPageLoads() throws Throwable {
         assertEquals("object", executeJavaScriptAndGetStringResult("typeof testController"));
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mTestCallbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = onPageFinishedHelper.getCallCount();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                getContentView().reload();
+                getContentView().getContentViewCore().reload(true);
             }
         });
         onPageFinishedHelper.waitForCallback(currentCallCount);
         assertEquals("object", executeJavaScriptAndGetStringResult("typeof testController"));
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testSameObjectInjectedMultipleTimes() throws Throwable {
         class TestObject {
             private int mNumMethodInvocations;
             public void method() { mTestController.setIntValue(++mNumMethodInvocations); }
         }
         final TestObject testObject = new TestObject();
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mTestCallbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = onPageFinishedHelper.getCallCount();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 getContentView().getContentViewCore().addPossiblyUnsafeJavascriptInterface(
                         testObject, "testObject1", null);
                 getContentView().getContentViewCore().addPossiblyUnsafeJavascriptInterface(
                         testObject, "testObject2", null);
-                getContentView().reload();
+                getContentView().getContentViewCore().reload(true);
             }
         });
         onPageFinishedHelper.waitForCallback(currentCallCount);
         executeJavaScript("testObject1.method()");
         assertEquals(1, mTestController.waitForIntValue());
         executeJavaScript("testObject2.method()");
         assertEquals(2, mTestController.waitForIntValue());
     }
 
     @SmallTest
@@ skipping 26 matching lines @@
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mTestCallbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = onPageFinishedHelper.getCallCount();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 getContentView().getContentViewCore().addPossiblyUnsafeJavascriptInterface(
                         object, "testObject", null);
                 getContentView().getContentViewCore().addPossiblyUnsafeJavascriptInterface(
                         innerObject, "innerObject", null);
-                getContentView().reload();
+                getContentView().getContentViewCore().reload(true);
             }
         });
         onPageFinishedHelper.waitForCallback(currentCallCount);
         executeJavaScript("testObject.getInnerObject().method()");
         assertEquals(1, mTestController.waitForIntValue());
         executeJavaScript("innerObject.method()");
         assertEquals(2, mTestController.waitForIntValue());
     }
 
     @SmallTest
@@ skipping 41 matching lines @@
         assertEquals("undefined", executeJavaScriptAndGetStringResult("typeof testObject.method"));
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testOverriddenMethod() throws Throwable {
         class Base {
             public void method() { mTestController.setStringValue("base"); }
         }
         class Derived extends Base {
+            @Override
             public void method() { mTestController.setStringValue("derived"); }
         }
         injectObjectAndReload(new Derived(), "testObject");
         executeJavaScript("testObject.method()");
         assertEquals("derived", mTestController.waitForStringValue());
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testEnumerateMembers() throws Throwable {
@@ skipping 218 matching lines @@
         // Manually inject the Test object, making sure to use the
         // ContentViewCore#addJavascriptInterface, not the possibly unsafe version.
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mTestCallbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = onPageFinishedHelper.getCallCount();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 getContentView().getContentViewCore().addJavascriptInterface(new Test(),
                         "testObject");
-                getContentView().reload();
+                getContentView().getContentViewCore().reload(true);
             }
         });
         onPageFinishedHelper.waitForCallback(currentCallCount);
 
         // Test#allowed() should pass, as it is annotated with JavascriptInterface.
         assertEquals("bar", executeJavaScriptAndGetStringResult(
                 "testObject.allowed()"));
 
         // Test#blocked() should fail, as it isn't annotated with JavascriptInterface.
         assertRaisesException("testObject.blocked()");
         assertEquals("undefined", executeJavaScriptAndGetStringResult(
                 "typeof testObject.blocked"));
     }
 }