Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents

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

 // Copyright 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.test.util.TestCallbackHelperContainer;
@@ skipping 99 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() {
                 getContentViewCore().addPossiblyUnsafeJavascriptInterface(object,
                         name, requiredAnnotation);
-                getContentViewCore().reload(true);
+                getContentViewCore().getWebContents().getNavigationController().reload(true);
             }
         });
         onPageFinishedHelper.waitForCallback(currentCallCount);
     }
 
     protected void synchronousPageReload() throws Throwable {
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mTestCallbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = onPageFinishedHelper.getCallCount();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                getContentViewCore().reload(true);
+                getContentViewCore().getWebContents().getNavigationController().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 44 matching lines @@
     @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() {
                 getContentViewCore().removeJavascriptInterface("foo");
-                getContentViewCore().reload(true);
+                getContentViewCore().getWebContents().getNavigationController().reload(true);
             }
         });
         onPageFinishedHelper.waitForCallback(currentCallCount);
         assertEquals("undefined", executeJavaScriptAndGetStringResult("typeof foo"));
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testTypeOfMethod() throws Throwable {
         assertEquals("function",
@@ skipping 141 matching lines @@
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mTestCallbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = onPageFinishedHelper.getCallCount();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 getContentViewCore().addPossiblyUnsafeJavascriptInterface(
                         testObject, "testObject1", null);
                 getContentViewCore().addPossiblyUnsafeJavascriptInterface(
                         testObject, "testObject2", null);
-                getContentViewCore().reload(true);
+                getContentViewCore().getWebContents().getNavigationController().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() {
                 getContentViewCore().addPossiblyUnsafeJavascriptInterface(
                         object, "testObject", null);
                 getContentViewCore().addPossiblyUnsafeJavascriptInterface(
                         innerObject, "innerObject", null);
-                getContentViewCore().reload(true);
+                getContentViewCore().getWebContents().getNavigationController().reload(true);
             }
         });
         onPageFinishedHelper.waitForCallback(currentCallCount);
         executeJavaScript("testObject.getInnerObject().method()");
         assertEquals(1, mTestController.waitForIntValue());
         executeJavaScript("innerObject.method()");
         assertEquals(2, mTestController.waitForIntValue());
     }
 
     // Verify that Java objects returned from bridge object methods are dereferenced
@@ skipping 120 matching lines @@
         assertEquals("derived", mTestController.waitForStringValue());
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testEnumerateMembers() throws Throwable {
         injectObjectAndReload(new Object() {
             public void method() {}
             private void privateMethod() {}
             public int field;
-            private int privateField;
+            private int mPrivateField;
         }, "testObject");
         executeJavaScript(
                 "var result = \"\"; " +
                 "for (x in testObject) { result += \" \" + x } " +
                 "testController.setStringValue(result);");
         assertEquals(" equals getClass hashCode method notify notifyAll toString wait",
                 mTestController.waitForStringValue());
     }
 
     @SmallTest
@@ skipping 32 matching lines @@
         assertRaisesException(
                 "testObject.myGetClass().getDeclaredMethod('method', null)." +
                 "invoke(testObject, null)");
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testReflectPrivateFieldRaisesException() throws Throwable {
         injectObjectAndReload(new Object() {
             public Class<?> myGetClass() { return getClass(); }
-            private int field;
+            private int mField;
         }, "testObject");
         assertRaisesException("testObject.myGetClass().getField('field')");
         // getDeclaredField() is able to access a private field, but getInt()
         // throws a Java exception.
         assertRaisesException(
                 "testObject.myGetClass().getDeclaredField('field').getInt(testObject)");
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
@@ skipping 155 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() {
                 getContentViewCore().addJavascriptInterface(new Test(),
                         "testObject");
-                getContentViewCore().reload(true);
+                getContentViewCore().getWebContents().getNavigationController().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()");
@@ skipping 47 matching lines @@
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testAccessToObjectGetClassIsBlocked() throws Throwable {
         injectObjectAndReload(new Object(), "testObject");
         assertEquals("function", executeJavaScriptAndGetStringResult("typeof testObject.getClass"));
         assertRaisesException("testObject.getClass()");
     }
 }