Unfork IDS_PAGE_INFO_NON_SECURE_TRANSPORT into IDS_PAGEINFO_NOT_SECURE_SUMMARY

ios/chrome/browser/ui/dialogs/nsurl_protection_space_util_unittest.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/dialogs/nsurl_protection_space_util.h"
 
 #include "base/ios/ios_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/strings/grit/components_strings.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 63 matching lines @@
 // Tests showing the dialog for SOCKS proxy server.
 TEST(NSURLProtectionSpaceUtilTest, ShowForSocksProxy) {
   NSURLProtectionSpace* protectionSpace =
       GetProtectionSpaceForProxyHost(kTestHost, NSURLProtectionSpaceSOCKSProxy);
 
   ASSERT_TRUE(CanShow(protectionSpace));
 
   // 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));
 }
 
 // Tests showing the dialog for http proxy server.
 TEST(NSURLProtectionSpaceUtilTest, ShowForHttpProxy) {
   NSURLProtectionSpace* protectionSpace =
       GetProtectionSpaceForProxyHost(kTestHost, NSURLProtectionSpaceHTTPProxy);
 
   ASSERT_TRUE(CanShow(protectionSpace));
 
   // 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));
 }
 
 // Tests showing the dialog for https proxy server.
 TEST(NSURLProtectionSpaceUtilTest, ShowForHttpsProxy) {
   NSURLProtectionSpace* protectionSpace =
       GetProtectionSpaceForProxyHost(kTestHost, NSURLProtectionSpaceHTTPSProxy);
 
   ASSERT_TRUE(CanShow(protectionSpace));
 
   NSString* expectedText = nil;
   // On iOS 10, HTTPS Proxy protection space reports itself as unsecure
   // (crbug.com/629570).
   if (base::ios::IsRunningOnIOS10OrLater()) {
     // Expecting the following text:
     // The proxy https://chromium.org requires a username and password.
     // Your connection to this site is not private.
     expectedText = [NSString
         stringWithFormat:@"%@ %@",
                          l10n_util::GetNSStringF(
                              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.
     expectedText =
         l10n_util::GetNSStringF(IDS_LOGIN_DIALOG_PROXY_AUTHORITY,
                                 base::SysNSStringToUTF16(kTestHttpsOrigin));
   }
   EXPECT_NSEQ(expectedText, MessageForHTTPAuth(protectionSpace));
 }
 
 // Tests showing the dialog for http server.
 TEST(NSURLProtectionSpaceUtilTest, ShowForHttpServer) {
   NSURLProtectionSpace* protectionSpace =
       GetProtectionSpaceForHost(kTestHost, NSURLProtectionSpaceHTTP);
 
   ASSERT_TRUE(CanShow(protectionSpace));
 
   // 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));
 }
 
 // Tests showing the dialog for https server.
 TEST(NSURLProtectionSpaceUtilTest, ShowForHttpsServer) {
   NSURLProtectionSpace* protectionSpace =
       GetProtectionSpaceForHost(kTestHost, NSURLProtectionSpaceHTTPS);
 
   ASSERT_TRUE(CanShow(protectionSpace));
 
   // Expecting the following text:
   // https://chromium.org:80 requires a username and password.
   NSString* expectedText = l10n_util::GetNSStringF(
       IDS_LOGIN_DIALOG_AUTHORITY, base::SysNSStringToUTF16(kTestHttpsOrigin));
   EXPECT_NSEQ(expectedText, MessageForHTTPAuth(protectionSpace));
 }