Upstream version 7.36.149.0

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

diff --git a/src/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java b/src/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java
index cc15e24..54d2233 100644 (file)
--- a/src/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java
+++ b/src/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java
@@ -9,10 +9,10 @@ import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.browser.ContentViewUtil;
 import org.chromium.chrome.shell.ChromeShellTestBase;
 import org.chromium.content.browser.ContentView;
+import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.Criteria;
 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.UiUtils;
 import org.chromium.ui.base.ActivityWindowAndroid;
 import org.chromium.ui.base.WindowAndroid;
@@ -35,8 +35,8 @@ public class SelectPopupOtherContentViewTest extends ChromeShellTestBase {
     private class PopupShowingCriteria implements Criteria {
         @Override
         public boolean isSatisfied() {
-            ContentView view = getActivity().getActiveContentView();
-            return view.getContentViewCore().getSelectPopupForTest() != null;
+            ContentViewCore contentViewCore = getActivity().getActiveContentViewCore();
+            return contentViewCore.getSelectPopupForTest() != null;
         }
     }
 
@@ -58,12 +58,10 @@ public class SelectPopupOtherContentViewTest extends ChromeShellTestBase {
         launchChromeShellWithUrl(SELECT_URL);
         assertTrue("Page failed to load", waitForActiveShellToBeDoneLoading());
 
-        final ContentView view = getActivity().getActiveContentView();
-        final TestCallbackHelperContainer viewClient =
-                new TestCallbackHelperContainer(view);
+        final ContentViewCore viewCore = getActivity().getActiveContentViewCore();
 
         // Once clicked, the popup should show up.
-        DOMUtils.clickNode(this, view, viewClient, "select");
+        DOMUtils.clickNode(this, viewCore, "select");
         assertTrue("The select popup did not show up on click.",
                 CriteriaHelper.pollForCriteria(new PopupShowingCriteria()));
 
@@ -75,7 +73,7 @@ public class SelectPopupOtherContentViewTest extends ChromeShellTestBase {
                 WindowAndroid windowAndroid = new ActivityWindowAndroid(getActivity());
                 ContentView contentView = ContentView.newInstance(
                         getActivity(), nativeWebContents, windowAndroid);
-                contentView.destroy();
+                contentView.getContentViewCore().destroy();
             }
         });
 
@@ -84,6 +82,6 @@ public class SelectPopupOtherContentViewTest extends ChromeShellTestBase {
 
         // The popup should still be shown.
         assertNotNull("The select popup got hidden by destroying of unrelated ContentViewCore.",
-                view.getContentViewCore().getSelectPopupForTest());
+                viewCore.getSelectPopupForTest());
     }
 }