android_webview/javatests/src/org/chromium/android_webview/test/UserAgentTest.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/UserAgentTest.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/NavigationHistoryTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.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/UserAgentTest.java

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

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

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

@@ -9,19 +9,20 @@

import java.util.regex.Matcher;

import java.util.regex.Pattern;

-import org.chromium.android_webview.AwContents;

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

+import org.chromium.content.browser.ContentViewCore;

public class UserAgentTest extends AndroidWebViewTestBase {

private TestAwContentsClient mContentsClient;

- private AwContents mAwContents;

+ private ContentViewCore mContentViewCore;

@Override

public void setUp() throws Exception {

super.setUp();

mContentsClient = new TestAwContentsClient();

- mAwContents = createAwTestContainerViewOnMainSync(mContentsClient).getAwContents();

+ mContentViewCore =

+ createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();

}

/**

@@ -31,16 +32,16 @@

@SmallTest

@Feature({"Android-WebView"})

public void testNoExtraSpaceBeforeBuildName() throws Throwable {

- getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true);

+ getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true);

loadDataSync(

- mAwContents,

+ mContentViewCore,

mContentsClient.getOnPageFinishedHelper(),

// Spaces are replaced with underscores to avoid consecutive spaces compression.

"<html>" +

"<body onload='document.title=navigator.userAgent.replace(/ /g, \"_\")'></body>" +

"</html>",

"text/html", false);

- final String ua = getTitleOnUiThread(mAwContents);

+ final String ua = getTitleOnUiThread(mContentViewCore);

Matcher matcher = Pattern.compile("Android_[^;]+;_[^_]").matcher(ua);

assertTrue(matcher.find());

}