chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java - Issue 831523005: Remove most native WebContents references from Java

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java

Issue 831523005: Remove most native WebContents references from Java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Kept same error checking behavior for aw_contents.cc Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java » ('j') | chrome/browser/android/content_view_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java

index b4a8c15d309ba9895f45368ec04347b2006c2e3f..306b11cb8a8d2c1f30162edc144002f6133f91f6 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java

@@ -14,23 +14,27 @@ 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_public.browser.WebContents;

import org.chromium.ui.base.ActivityWindowAndroid;

import org.chromium.ui.base.WindowAndroid;

+/**

+ * Test the select popup and how it interacts with another ContentViewCore.

+ */

public class SelectPopupOtherContentViewTest extends ChromeShellTestBase {

private static final String SELECT_URL = UrlUtils.encodeHtmlDataUri(

- "<html><body>" +

- "Which animal is the strongest:<br/>" +

- "<select id=\"select\">" +

- "<option>Black bear</option>" +

- "<option>Polar bear</option>" +

- "<option>Grizzly</option>" +

- "<option>Tiger</option>" +

- "<option>Lion</option>" +

- "<option>Gorilla</option>" +

- "<option>Chipmunk</option>" +

- "</select>" +

- "</body></html>");

+ "<html><body>"

+ + "Which animal is the strongest:<br/>"

+ + "<select id=\"select\">"

+ + "<option>Black bear</option>"

+ + "<option>Polar bear</option>"

+ + "<option>Grizzly</option>"

+ + "<option>Tiger</option>"

+ + "<option>Lion</option>"

+ + "<option>Gorilla</option>"

+ + "<option>Chipmunk</option>"

+ + "</select>"

+ + "</body></html>");

private class PopupShowingCriteria implements Criteria {

@Override

@@ -69,12 +73,12 @@ public class SelectPopupOtherContentViewTest extends ChromeShellTestBase {

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

- long nativeWebContents = ContentViewUtil.createNativeWebContents(false);

+ WebContents webContents = ContentViewUtil.createWebContents(false, false);

WindowAndroid windowAndroid = new ActivityWindowAndroid(getActivity());

ContentViewCore contentViewCore = new ContentViewCore(getActivity());

ContentView cv = ContentView.newInstance(getActivity(), contentViewCore);

- contentViewCore.initialize(cv, cv, nativeWebContents, windowAndroid);

+ contentViewCore.initialize(cv, cv, webContents, windowAndroid);

contentViewCore.destroy();

}

});