Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / public / android / javatests / src / org / chromium / content / browser / GestureDetectorResetTest.java

diff --git a/src/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java b/src/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java
index 7e42be7..71e1278 100644 (file)
--- a/src/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java
+++ b/src/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java
@@ -15,10 +15,15 @@ import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;
+import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_shell_apk.ContentShellTestBase;
 
 import java.util.concurrent.TimeUnit;
 
+/**
+ * Provides test environment for Gesture Detector Reset for Content Shell.
+ * This is a helper class for Content Shell tests.
+*/
 public class GestureDetectorResetTest extends ContentShellTestBase {
     private static final long WAIT_TIMEOUT_SECONDS = scaleTimeout(2);
     private static final String CLICK_TEST_URL = UrlUtils.encodeHtmlDataUri(
@@ -120,8 +125,9 @@ public class GestureDetectorResetTest extends ContentShellTestBase {
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                getActivity().getActiveShell().getContentViewCore().loadUrl(
-                        new LoadUrlParams(CLICK_TEST_URL));
+                getActivity().getActiveShell().getContentViewCore().getWebContents()
+                        .getNavigationController().loadUrl(
+                                new LoadUrlParams(CLICK_TEST_URL));
             }
         });
         onPageFinishedHelper.waitForCallback(currentCallCount, 1,