android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java - Issue 11098030: Revert 160959 - [android_webview] Use AwContents loadUrl method instead of ContentViewCore.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java

Issue 11098030: Revert 160959 - [android_webview] Use AwContents loadUrl method instead of ContentViewCore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 2 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 | « android_webview/javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java

===================================================================

--- android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java (revision 160963)

+++ android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java (working copy)

@@ -14,7 +14,6 @@

import android.test.mock.MockContext;

import android.test.suitebuilder.annotation.SmallTest;

-import org.chromium.android_webview.AwContents;

import org.chromium.base.test.util.DisabledTest;

import org.chromium.base.test.util.Feature;

import org.chromium.base.ThreadUtils;

@@ -32,17 +31,14 @@

public class ContentViewMiscTest extends AndroidWebViewTestBase {

private TestAwContentsClient mContentsClient;

- private AwContents mAwContents;

private ContentViewCore mContentViewCore;

@Override

public void setUp() throws Exception {

super.setUp();

mContentsClient = new TestAwContentsClient();

- final AwTestContainerView testContainerView =

- createAwTestContainerViewOnMainSync(mContentsClient);

- mAwContents = testContainerView.getAwContents();

- mContentViewCore = testContainerView.getContentViewCore();

+ mContentViewCore =

+ createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();

}

/**

@@ -57,7 +53,7 @@

.append("</body></html>");

// Test flinging in the y axis

- loadUrlSync(mAwContents , mContentsClient.getOnPageFinishedHelper(),

+ loadUrlSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),

testPage.toString());

assertEquals(0, mContentViewCore.getNativeScrollYForTest());

ThreadUtils.runOnUiThread(new Runnable() {

@@ -155,7 +151,7 @@

@DisabledTest

public void testSetGetBackgroundColor() throws Throwable {

- loadUrlSync(mAwContents , mContentsClient.getOnPageFinishedHelper(), "about:blank");

+ loadUrlSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(), "about:blank");

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {