android_webview/javatests/src/org/chromium/android_webview/test/ClearHistoryTest.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/ClearHistoryTest.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/AwSettingsTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.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/ClearHistoryTest.java

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

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

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

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

import android.test.suitebuilder.annotation.SmallTest;

-import org.chromium.android_webview.AwContents;

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

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.test.util.HistoryUtils;

@@ -28,14 +27,12 @@

@Feature({"History", "Main"})

public void testClearHistory() throws Throwable {

final TestAwContentsClient contentsClient = new TestAwContentsClient();

- final AwTestContainerView testContainerView =

- createAwTestContainerViewOnMainSync(contentsClient);

- final AwContents awContents = testContainerView.getAwContents();

- final ContentViewCore contentViewCore = testContainerView.getContentViewCore();

+ final ContentViewCore contentViewCore =

+ createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();

OnPageFinishedHelper onPageFinishedHelper = contentsClient.getOnPageFinishedHelper();

for (int i = 0; i < 3; i++) {

- loadUrlSync(awContents, onPageFinishedHelper, URLS[i]);

+ loadUrlSync(contentViewCore, onPageFinishedHelper, URLS[i]);

}

HistoryUtils.goBackSync(getInstrumentation(), contentViewCore, onPageFinishedHelper);