chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeTest.java - Issue 2110543004: Move JNI bindings for url_formatter from chrome to //components/url_formatter

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: chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeTest.java

Issue 2110543004: Move JNI bindings for url_formatter from chrome to //components/url_formatter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 4 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/webapps/WebappUrlBar.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/util/UrlUtilitiesTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeTest.java

index 5870ba6bc31493f4f0a22154017cd799be43bda3..5af40f7c243a68a84a5ce125d1512c17fb8eb4da 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeTest.java

@@ -18,9 +18,9 @@ import org.chromium.base.annotations.SuppressFBWarnings;

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

import org.chromium.chrome.browser.preferences.PrefServiceBridge;

import org.chromium.chrome.browser.preferences.website.ContentSetting;

-import org.chromium.chrome.browser.util.UrlUtilities;

import org.chromium.chrome.browser.widget.RoundedIconGenerator;

import org.chromium.chrome.test.util.browser.notifications.MockNotificationManagerProxy.NotificationEntry;

+import org.chromium.components.url_formatter.UrlFormatter;

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

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

@@ -54,7 +54,7 @@ public class NotificationPlatformBridgeTest extends NotificationTestBase {

// Validate the contents of the notification.

assertEquals("MyNotification", notification.extras.getString(Notification.EXTRA_TITLE));

assertEquals("Hello", notification.extras.getString(Notification.EXTRA_TEXT));

- assertEquals(UrlUtilities.formatUrlForSecurityDisplay(getOrigin(), false /* showScheme */),

+ assertEquals(UrlFormatter.formatUrlForSecurityDisplay(getOrigin(), false /* showScheme */),

notification.extras.getString(Notification.EXTRA_SUB_TEXT));

// Verify that the ticker text contains the notification's title and body.