Upstream version 7.36.149.0

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

diff --git a/src/content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java b/src/content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
index 8ef7218..6480854 100644 (file)
--- a/src/content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
+++ b/src/content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
@@ -4,10 +4,10 @@
 
 package org.chromium.content.browser;
 
-import android.net.Uri;
-
 import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
 
+import android.net.Uri;
+
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
@@ -32,7 +32,7 @@ public class ContentDetectionTestBase extends ContentShellTestBase {
      */
     protected TestCallbackHelperContainer getTestCallbackHelperContainer() {
         if (mCallbackHelper == null) {
-            mCallbackHelper = new TestCallbackHelperContainer(getContentView());
+            mCallbackHelper = new TestCallbackHelperContainer(getContentViewCore());
         }
         return mCallbackHelper;
     }
@@ -52,7 +52,7 @@ public class ContentDetectionTestBase extends ContentShellTestBase {
      * @return true if the test url is the current one, false otherwise.
      */
     protected boolean isCurrentTestUrl(String testUrl) {
-        return UrlUtils.getTestFileUrl(testUrl).equals(getContentView().getUrl());
+        return UrlUtils.getTestFileUrl(testUrl).equals(getContentViewCore().getUrl());
     }
 
     /**
@@ -66,8 +66,8 @@ public class ContentDetectionTestBase extends ContentShellTestBase {
                 callbackHelperContainer.getOnStartContentIntentHelper();
         int currentCallCount = onStartContentIntentHelper.getCallCount();
 
-        DOMUtils.scrollNodeIntoView(getContentView(), callbackHelperContainer, id);
-        DOMUtils.clickNode(this, getContentView(), callbackHelperContainer, id);
+        DOMUtils.scrollNodeIntoView(getContentViewCore(), id);
+        DOMUtils.clickNode(this, getContentViewCore(), id);
 
         onStartContentIntentHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
                 TimeUnit.SECONDS);
@@ -87,8 +87,8 @@ public class ContentDetectionTestBase extends ContentShellTestBase {
                 callbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = onPageFinishedHelper.getCallCount();
 
-        DOMUtils.scrollNodeIntoView(getContentView(), callbackHelperContainer, id);
-        DOMUtils.clickNode(this, getContentView(), callbackHelperContainer, id);
+        DOMUtils.scrollNodeIntoView(getContentViewCore(), id);
+        DOMUtils.clickNode(this, getContentViewCore(), id);
 
         onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
                 TimeUnit.SECONDS);