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

android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
index f123585d215f947a6a65e0f46d889d5e373eb81a..ae0cc4bf7c53f19d19aebab616968c52acea7f1a 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
@@ -60,7 +60,7 @@ public class NavigationHistoryTest extends AwTestBase {
         return ThreadUtils.runOnUiThreadBlocking(new Callable<NavigationHistory>() {
             @Override
             public NavigationHistory call() {
-                return awContents.getContentViewCore().getNavigationHistory();
+                return awContents.getNavigationController().getNavigationHistory();
             }
         });
     }
@@ -171,8 +171,8 @@ public class NavigationHistoryTest extends AwTestBase {
         loadUrlSync(mAwContents, onPageFinishedHelper, page1Url);
         loadUrlSync(mAwContents, onPageFinishedHelper, page2Url);
 
-        HistoryUtils.goBackSync(getInstrumentation(), mAwContents.getContentViewCore(),
-                onPageFinishedHelper);
+        HistoryUtils.goBackSync(getInstrumentation(), mAwContents.getContentViewCore().
+                getWebContents(), onPageFinishedHelper);
         list = getNavigationHistory(mAwContents);
 
         // Make sure the first entry is still okay
@@ -288,7 +288,7 @@ public class NavigationHistoryTest extends AwTestBase {
         pollOnUiThread(new Callable<Boolean>() {
             @Override
             public Boolean call() {
-                String title = mAwContents.getContentViewCore().getTitle();
+                String title = mAwContents.getTitle();
                 return LOGIN_RESPONSE_PAGE_TITLE.equals(title);
             }
         });
@@ -299,18 +299,18 @@ public class NavigationHistoryTest extends AwTestBase {
         pollOnUiThread(new Callable<Boolean>() {
             @Override
             public Boolean call() {
-                String title = mAwContents.getContentViewCore().getTitle();
+                String title = mAwContents.getTitle();
                 return PAGE_1_TITLE.equals(title);
             }
         });
         // Verify that we can still go back to the login response page despite that
         // it is non-cacheable.
-        HistoryUtils.goBackSync(getInstrumentation(), mAwContents.getContentViewCore(),
-                onPageFinishedHelper);
+        HistoryUtils.goBackSync(getInstrumentation(), mAwContents.getContentViewCore().
+                getWebContents(), onPageFinishedHelper);
         pollOnUiThread(new Callable<Boolean>() {
             @Override
             public Boolean call() {
-                String title = mAwContents.getContentViewCore().getTitle();
+                String title = mAwContents.getTitle();
                 return LOGIN_RESPONSE_PAGE_TITLE.equals(title);
             }
         });