Index: android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java |
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java |
index 4597da426f364a6f8b46bedd214efc80284de846..e67921477280a0ae5314c22c27f052ea167fcb3f 100644 |
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java |
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java |
@@ -11,10 +11,10 @@ package org.chromium.android_webview.test; |
import android.test.suitebuilder.annotation.MediumTest; |
import android.test.suitebuilder.annotation.SmallTest; |
+import org.chromium.android_webview.AwContents; |
import org.chromium.android_webview.JsPromptResultReceiver; |
import org.chromium.android_webview.JsResultReceiver; |
import org.chromium.base.test.util.Feature; |
-import org.chromium.content.browser.ContentViewCore; |
import org.chromium.content.browser.test.util.CallbackHelper; |
import java.util.concurrent.atomic.AtomicBoolean; |
@@ -48,12 +48,12 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase { |
} |
}; |
AwTestContainerView view = createAwTestContainerViewOnMainSync(client); |
- final ContentViewCore contentViewCore = view.getContentViewCore(); |
+ final AwContents awContents = view.getAwContents(); |
- enableJavaScriptOnUiThread(contentViewCore); |
- loadDataSync(contentViewCore, client.getOnPageFinishedHelper(), |
+ enableJavaScriptOnUiThread(awContents); |
+ loadDataSync(awContents, client.getOnPageFinishedHelper(), |
EMPTY_PAGE, "text/html", false); |
- executeJavaScriptAndWaitForResult(contentViewCore, client, |
+ executeJavaScriptAndWaitForResult(awContents, client, |
"alert('" + ALERT_TEXT + "')"); |
assertTrue(callbackCalled.get()); |
} |
@@ -81,12 +81,12 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase { |
} |
}; |
AwTestContainerView view = createAwTestContainerViewOnMainSync(client); |
- ContentViewCore contentViewCore = view.getContentViewCore(); |
+ final AwContents awContents = view.getAwContents(); |
- enableJavaScriptOnUiThread(contentViewCore); |
- loadDataSync(contentViewCore, client.getOnPageFinishedHelper(), |
+ enableJavaScriptOnUiThread(awContents); |
+ loadDataSync(awContents, client.getOnPageFinishedHelper(), |
EMPTY_PAGE, "text/html", false); |
- String result = executeJavaScriptAndWaitForResult(contentViewCore, client, |
+ String result = executeJavaScriptAndWaitForResult(awContents, client, |
"prompt('" + PROMPT_TEXT + "','" + PROMPT_DEFAULT + "')"); |
assertTrue(called.get()); |
assertEquals("\"" + PROMPT_RESULT + "\"", result); |
@@ -111,12 +111,12 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase { |
} |
}; |
AwTestContainerView view = createAwTestContainerViewOnMainSync(client); |
- ContentViewCore contentViewCore = view.getContentViewCore(); |
- enableJavaScriptOnUiThread(contentViewCore); |
+ final AwContents awContents = view.getAwContents(); |
+ enableJavaScriptOnUiThread(awContents); |
- loadDataSync(contentViewCore, client.getOnPageFinishedHelper(), |
+ loadDataSync(awContents, client.getOnPageFinishedHelper(), |
EMPTY_PAGE, "text/html", false); |
- String result = executeJavaScriptAndWaitForResult(contentViewCore, client, |
+ String result = executeJavaScriptAndWaitForResult(awContents, client, |
"confirm('" + CONFIRM_TEXT + "')"); |
assertTrue(called.get()); |
assertEquals("true", result); |
@@ -141,12 +141,12 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase { |
} |
}; |
AwTestContainerView view = createAwTestContainerViewOnMainSync(client); |
- ContentViewCore contentViewCore = view.getContentViewCore(); |
- enableJavaScriptOnUiThread(contentViewCore); |
+ final AwContents awContents = view.getAwContents(); |
+ enableJavaScriptOnUiThread(awContents); |
- loadDataSync(contentViewCore, client.getOnPageFinishedHelper(), |
+ loadDataSync(awContents, client.getOnPageFinishedHelper(), |
EMPTY_PAGE, "text/html", false); |
- String result = executeJavaScriptAndWaitForResult(contentViewCore, client, |
+ String result = executeJavaScriptAndWaitForResult(awContents, client, |
"confirm('" + CONFIRM_TEXT + "')"); |
assertTrue(called.get()); |
assertEquals("false", result); |
@@ -167,16 +167,16 @@ public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase { |
} |
}; |
AwTestContainerView view = createAwTestContainerViewOnMainSync(client); |
- ContentViewCore contentViewCore = view.getContentViewCore(); |
- enableJavaScriptOnUiThread(contentViewCore); |
+ final AwContents awContents = view.getAwContents(); |
+ enableJavaScriptOnUiThread(awContents); |
- loadDataSync(contentViewCore, client.getOnPageFinishedHelper(), BEFORE_UNLOAD_URL, |
+ loadDataSync(awContents, client.getOnPageFinishedHelper(), BEFORE_UNLOAD_URL, |
"text/html", false); |
- enableJavaScriptOnUiThread(contentViewCore); |
+ enableJavaScriptOnUiThread(awContents); |
// Don't wait synchronously because we don't leave the page. |
int currentCallCount = jsBeforeUnloadHelper.getCallCount(); |
- loadDataAsync(contentViewCore, EMPTY_PAGE, "text/html", false); |
+ loadDataAsync(awContents, EMPTY_PAGE, "text/html", false); |
jsBeforeUnloadHelper.waitForCallback(currentCallCount); |
} |
} |