Revert 160959 - [android_webview] Use AwContents loadUrl method instead of ContentViewCore.

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java
===================================================================
--- android_webview/javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java	(revision 160963)
+++ android_webview/javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java	(working copy)
@@ -7,9 +7,9 @@
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 
-import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwWebContentsDelegate;
 import org.chromium.base.test.util.Feature;
+import org.chromium.content.browser.ContentViewCore;
 
 /**
  * Tests for the ContentViewClient.addMessageToConsole() method.
@@ -24,20 +24,19 @@
     private static final String TEST_MESSAGE_TWO = "The second test message.";
 
     private TestAwContentsClient mContentsClient;
-    private AwContents mAwContents;
+    private ContentViewCore mContentViewCore;
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
         mContentsClient = new TestAwContentsClient();
-        final AwTestContainerView testContainerView =
-                createAwTestContainerViewOnMainSync(mContentsClient);
-        mAwContents = testContainerView.getAwContents();
+        mContentViewCore =
+                createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
 
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                mAwContents.getContentViewCore().getContentSettings().setJavaScriptEnabled(true);
+                mContentViewCore.getContentSettings().setJavaScriptEnabled(true);
             }
         });
     }
@@ -64,7 +63,7 @@
                 mContentsClient.getAddMessageToConsoleHelper();
 
         int callCount = addMessageToConsoleHelper.getCallCount();
-        loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+        loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
                      getLogMessageJavaScriptData("error", "msg"),
                      "text/html", false);
         addMessageToConsoleHelper.waitForCallback(callCount);
@@ -72,7 +71,7 @@
                 addMessageToConsoleHelper.getLevel());
 
         callCount = addMessageToConsoleHelper.getCallCount();
-        loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+        loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
                      getLogMessageJavaScriptData("warn", "msg"),
                      "text/html", false);
         addMessageToConsoleHelper.waitForCallback(callCount);
@@ -80,7 +79,7 @@
                 addMessageToConsoleHelper.getLevel());
 
         callCount = addMessageToConsoleHelper.getCallCount();
-        loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+        loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
                      getLogMessageJavaScriptData("log", "msg"),
                      "text/html", false);
         addMessageToConsoleHelper.waitForCallback(callCount);
@@ -98,7 +97,7 @@
                 mContentsClient.getAddMessageToConsoleHelper();
 
         int callCount = addMessageToConsoleHelper.getCallCount();
-        loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+        loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
                      getLogMessageJavaScriptData("log", TEST_MESSAGE_ONE),
                      "text/html", false);
         Log.w("test", getLogMessageJavaScriptData("log", TEST_MESSAGE_ONE));
@@ -106,7 +105,7 @@
         assertEquals(TEST_MESSAGE_ONE, addMessageToConsoleHelper.getMessage());
 
         callCount = addMessageToConsoleHelper.getCallCount();
-        loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+        loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
                      getLogMessageJavaScriptData("log", TEST_MESSAGE_TWO),
                      "text/html", false);
         addMessageToConsoleHelper.waitForCallback(callCount);
@@ -121,7 +120,7 @@
 
         int callCount = addMessageToConsoleHelper.getCallCount();
         String data = getLogMessageJavaScriptData("log", TEST_MESSAGE_ONE);
-        loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+        loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
                      data, "text/html", false);
         addMessageToConsoleHelper.waitForCallback(callCount);
         assertTrue("Url [" + addMessageToConsoleHelper.getSourceId() + "] expected to end with [" +