android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java - Issue 2406203002: Use BCP47 compliant format for locale representation

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/AcceptLanguageTest.java

Issue 2406203002: Use BCP47 compliant format for locale representation (Closed)

Patch Set: cleanup LocaleUtils, update codes that are not reverted from "rebase master" Created 4 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/java/src/org/chromium/android_webview/AwContents.java ('k') | android_webview/native/aw_contents.cc » ('j') | base/android/java/src/org/chromium/base/LocaleUtils.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java

index fa869b816b71280227674cbce27097136c692392..1369e7b67f71f1b5932ff91753d9c215e1cbd181 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java

@@ -85,7 +85,7 @@ public class AcceptLanguageTest extends AwTestBase {

JSUtils.executeJavaScriptAndWaitForResult(

this, mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper(),

"document.body.textContent"));

- assertEquals(LocaleUtils.getDefaultLocale(), acceptLanguages[0]);

+ assertEquals(LocaleUtils.getDefaultLocaleString(), acceptLanguages[0]);

String[] acceptLanguagesJs = getAcceptLanguages(

JSUtils.executeJavaScriptAndWaitForResult(

@@ -107,6 +107,6 @@ public class AcceptLanguageTest extends AwTestBase {

JSUtils.executeJavaScriptAndWaitForResult(

this, mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper(),

"document.body.textContent"));

- assertEquals(LocaleUtils.getDefaultLocale(), acceptLanguages[0]);

+ assertEquals(LocaleUtils.getDefaultLocaleString(), acceptLanguages[0]);

}