Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Unified Diff: ios/chrome/browser/ui/dialogs/nsurl_protection_space_util_unittest.mm

Issue 2847863004: Unfork IDS_PAGE_INFO_NON_SECURE_TRANSPORT into IDS_PAGEINFO_NOT_SECURE_SUMMARY (Closed)
Patch Set: Created 3 years, 8 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
Index: ios/chrome/browser/ui/dialogs/nsurl_protection_space_util_unittest.mm
diff --git a/ios/chrome/browser/ui/dialogs/nsurl_protection_space_util_unittest.mm b/ios/chrome/browser/ui/dialogs/nsurl_protection_space_util_unittest.mm
index b080d509024e55fbf027dc0c1340205ce718286a..2bfa73991204f8c3c3b0d1025feaab02d6ae5dd6 100644
--- a/ios/chrome/browser/ui/dialogs/nsurl_protection_space_util_unittest.mm
+++ b/ios/chrome/browser/ui/dialogs/nsurl_protection_space_util_unittest.mm
@@ -81,13 +81,12 @@ TEST(NSURLProtectionSpaceUtilTest, ShowForSocksProxy) {
// Expecting the following text:
// The proxy chromium.org requires a username and password.
// Your connection to this site is not private.
- NSString* expectedText =
- [NSString stringWithFormat:@"%@ %@",
- l10n_util::GetNSStringF(
- IDS_LOGIN_DIALOG_PROXY_AUTHORITY,
- base::SysNSStringToUTF16(kTestHost)),
- l10n_util::GetNSString(
- IDS_PAGE_INFO_NON_SECURE_TRANSPORT)];
+ NSString* expectedText = [NSString
+ stringWithFormat:@"%@ %@",
+ l10n_util::GetNSStringF(
+ IDS_LOGIN_DIALOG_PROXY_AUTHORITY,
+ base::SysNSStringToUTF16(kTestHost)),
+ l10n_util::GetNSString(IDS_PAGEINFO_NOT_SECURE_SUMMARY)];
EXPECT_NSEQ(expectedText, MessageForHTTPAuth(protectionSpace));
}
@@ -102,13 +101,12 @@ TEST(NSURLProtectionSpaceUtilTest, ShowForHttpProxy) {
// Expecting the following text:
// The proxy http://chromium.org requires a username and password.
// Your connection to this site is not private.
- NSString* expectedText =
- [NSString stringWithFormat:@"%@ %@",
- l10n_util::GetNSStringF(
- IDS_LOGIN_DIALOG_PROXY_AUTHORITY,
- base::SysNSStringToUTF16(kTestHttpOrigin)),
- l10n_util::GetNSString(
- IDS_PAGE_INFO_NON_SECURE_TRANSPORT)];
+ NSString* expectedText = [NSString
+ stringWithFormat:@"%@ %@",
+ l10n_util::GetNSStringF(
+ IDS_LOGIN_DIALOG_PROXY_AUTHORITY,
+ base::SysNSStringToUTF16(kTestHttpOrigin)),
+ l10n_util::GetNSString(IDS_PAGEINFO_NOT_SECURE_SUMMARY)];
EXPECT_NSEQ(expectedText, MessageForHTTPAuth(protectionSpace));
}
@@ -132,7 +130,7 @@ TEST(NSURLProtectionSpaceUtilTest, ShowForHttpsProxy) {
IDS_LOGIN_DIALOG_PROXY_AUTHORITY,
base::SysNSStringToUTF16(kTestHttpsOrigin)),
l10n_util::GetNSString(
- IDS_PAGE_INFO_NON_SECURE_TRANSPORT)];
+ IDS_PAGEINFO_NOT_SECURE_SUMMARY)];
} else {
// Expecting the following text:
// The proxy https://chromium.org:80 requires a username and password.
@@ -152,13 +150,12 @@ TEST(NSURLProtectionSpaceUtilTest, ShowForHttpServer) {
// Expecting the following text:
// http://chromium.org requires a username and password.
- NSString* expectedText =
- [NSString stringWithFormat:@"%@ %@",
- l10n_util::GetNSStringF(
- IDS_LOGIN_DIALOG_AUTHORITY,
- base::SysNSStringToUTF16(kTestHttpOrigin)),
- l10n_util::GetNSString(
- IDS_PAGE_INFO_NON_SECURE_TRANSPORT)];
+ NSString* expectedText = [NSString
+ stringWithFormat:@"%@ %@",
+ l10n_util::GetNSStringF(
+ IDS_LOGIN_DIALOG_AUTHORITY,
+ base::SysNSStringToUTF16(kTestHttpOrigin)),
+ l10n_util::GetNSString(IDS_PAGEINFO_NOT_SECURE_SUMMARY)];
EXPECT_NSEQ(expectedText, MessageForHTTPAuth(protectionSpace));
}

Powered by Google App Engine
This is Rietveld 408576698