Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / android / javatests / src / org / chromium / chrome / browser / test / ModalDialogTest.java

diff --git a/src/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java b/src/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java
index e224230..30c7ce7 100644 (file)
--- a/src/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java
+++ b/src/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java
@@ -265,7 +265,7 @@ public class ModalDialogTest extends ChromeShellTestBase {
         clickCancel(jsDialog);
         scriptEvent.waitUntilHasValue();
 
-        scriptEvent.evaluateJavaScript(getActivity().getActiveContentViewCore(),
+        scriptEvent.evaluateJavaScript(getActivity().getActiveContentViewCore().getWebContents(),
                 "alert('Android');");
         assertTrue("No further dialog boxes should be shown.", scriptEvent.waitUntilHasValue());
     }
@@ -283,7 +283,7 @@ public class ModalDialogTest extends ChromeShellTestBase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                getActivity().createTab(EMPTY_PAGE);
+                getActivity().closeAllTabs();
             }
         });
 
@@ -310,7 +310,7 @@ public class ModalDialogTest extends ChromeShellTestBase {
     private OnEvaluateJavaScriptResultHelper executeJavaScriptAndWaitForDialog(
             final OnEvaluateJavaScriptResultHelper helper, String script)
             throws InterruptedException {
-        helper.evaluateJavaScript(getActivity().getActiveContentViewCore(),
+        helper.evaluateJavaScript(getActivity().getActiveContentViewCore().getWebContents(),
                 script);
         boolean criteriaSatisfied = CriteriaHelper.pollForCriteria(
                 new JavascriptAppModalDialogShownCriteria(true));