Use grey triangle icon for HTTP when experiment enabled (iOS)

Bug: 1008219
Change-Id: I7517202a58ab3d363d9f8f6ba354f7c2a6dd08e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1884428Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Livvie Lin <livvielin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711711}

ios/chrome/browser/ui/location_bar/BUILD.gn

@@ -79,6 +79,7 @@ source_set("location_bar") {
     "//ios/public/provider/chrome/browser/voice",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
+    "//ios/web/common",
     "//ios/web/public:public",
     "//ios/web/public/security",
     "//skia",

ios/chrome/browser/ui/location_bar/location_bar_mediator.mm

@@ -24,6 +24,7 @@
 #import "ios/chrome/browser/web_state_list/web_state_list_observer_bridge.h"
 #import "ios/chrome/grit/ios_strings.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
+#import "ios/web/common/origin_util.h"
 #include "ios/web/public/navigation/navigation_item.h"
 #import "ios/web/public/navigation/navigation_manager.h"
 #include "ios/web/public/security/ssl_status.h"
@@ -320,8 +321,15 @@
     return [self imageForOfflinePage];
   }
 
-  return GetLocationBarSecurityIconForSecurityState(
-      self.locationBarModel->GetSecurityLevel());
+  security_state::SecurityLevel securityLevel =
+      self.locationBarModel->GetSecurityLevel();
+
+  bool shouldDowngrade = security_state::ShouldDowngradeNeutralStyling(
+      securityLevel, self.locationBarModel->GetURL(),
+      base::BindRepeating(&web::IsOriginSecure));
+
+  return GetLocationBarSecurityIconForSecurityState(securityLevel,
+                                                    shouldDowngrade);
 }
 
 // Returns a location icon for offline pages.

ios/chrome/browser/ui/omnibox/omnibox_util.h

@@ -31,14 +31,19 @@ UIImage* GetOmniboxSuggestionIconForAutocompleteMatchType(
 // Returns the asset with "always template" rendering mode.
 UIImage* GetLocationBarSecurityIcon(LocationBarSecurityIconType icon);
 
-// Converts the |security_level| to an appropriate security icon type.
+// Converts the |security_level| to an appropriate security icon type. If
+// |should_downgrade| is true, the info icon should be downgraded to a
+// grey triangle for non-secure connections.
 LocationBarSecurityIconType GetLocationBarSecurityIconTypeForSecurityState(
-    security_state::SecurityLevel security_level);
+    security_state::SecurityLevel security_level,
+    bool should_downgrade);
 
 // Converts the |security_level| to an appropriate icon in "always template"
-// rendering mode.
+// rendering mode. If |should_downgrade| is true, the info icon should be
+// downgraded to a grey triangle for non-secure connections.
 UIImage* GetLocationBarSecurityIconForSecurityState(
-    security_state::SecurityLevel security_level);
+    security_state::SecurityLevel security_level,
+    bool should_downgrade);
 
 #pragma mark - Legacy utils.
 

ios/chrome/browser/ui/omnibox/omnibox_util.mm

@@ -87,10 +87,13 @@ UIImage* GetLocationBarSecurityIcon(LocationBarSecurityIconType iconType) {
 
 // Converts the |security_level| to an appropriate security icon type.
 LocationBarSecurityIconType GetLocationBarSecurityIconTypeForSecurityState(
-    security_state::SecurityLevel security_level) {
+    security_state::SecurityLevel security_level,
+    bool should_downgrade) {
   switch (security_level) {
     case security_state::NONE:
     case security_state::WARNING:
+      if (should_downgrade)
+        return NOT_SECURE_WARNING;
       return INFO;
     case security_state::EV_SECURE:
     case security_state::SECURE:
@@ -107,9 +110,11 @@ LocationBarSecurityIconType GetLocationBarSecurityIconTypeForSecurityState(
 // Converts the |security_level| to an appropriate icon in "always template"
 // rendering mode.
 UIImage* GetLocationBarSecurityIconForSecurityState(
-    security_state::SecurityLevel security_level) {
+    security_state::SecurityLevel security_level,
+    bool should_downgrade) {
   LocationBarSecurityIconType iconType =
-      GetLocationBarSecurityIconTypeForSecurityState(security_level);
+      GetLocationBarSecurityIconTypeForSecurityState(security_level,
+                                                     should_downgrade);
   return GetLocationBarSecurityIcon(iconType);
 }
 

ios/chrome/browser/ui/page_info/BUILD.gn

@@ -15,6 +15,7 @@ source_set("page_info") {
     "//base",
     "//base:i18n",
     "//components/keyed_service/core",
+    "//components/security_state/core",
     "//components/ssl_errors",
     "//components/strings",
     "//ios/chrome/app/strings",
@@ -29,6 +30,7 @@ source_set("page_info") {
     "//ios/chrome/common",
     "//ios/chrome/common/colors",
     "//ios/web",
+    "//ios/web/common",
     "//ios/web/public/security",
     "//ui/base",
     "//ui/gfx",

ios/chrome/browser/ui/page_info/page_info_model.cc

@@ -16,6 +16,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/keyed_service/core/service_access_type.h"
+#include "components/security_state/core/security_state.h"
 #include "components/ssl_errors/error_info.h"
 #include "components/strings/grit/components_chromium_strings.h"
 #include "components/strings/grit/components_google_chrome_strings.h"
@@ -26,6 +27,7 @@
 #include "ios/chrome/grit/ios_chromium_strings.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
+#import "ios/web/common/origin_util.h"
 #include "ios/web/public/security/ssl_status.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
@@ -70,8 +72,16 @@ PageInfoModel::PageInfoModel(ios::ChromeBrowserState* browser_state,
   // Summary and details.
   SectionStateIcon icon_id = ICON_NONE;
   if (!ssl.certificate) {
-    // Not HTTPS.
+    // Not HTTPS. This maps to the WARNING security level. Show the grey
+    // triangle icon in page info based on the same logic used to determine
+    // the iconography in the omnibox.
+    if (security_state::ShouldDowngradeNeutralStyling(
+            security_state::SecurityLevel::WARNING, url,
+            base::BindRepeating(&web::IsOriginSecure))) {
+      icon_id = ICON_STATE_ERROR;
+    } else {
       icon_id = ICON_STATE_INFO;
+    }
     summary.assign(l10n_util::GetStringUTF16(IDS_PAGE_INFO_NOT_SECURE_SUMMARY));
     details.assign(l10n_util::GetStringUTF16(IDS_PAGE_INFO_NOT_SECURE_DETAILS));
   } else {
@@ -111,8 +121,16 @@ PageInfoModel::PageInfoModel(ios::ChromeBrowserState* browser_state,
             IDS_IOS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY, issuer_name));
       }
       if (ssl.content_status == web::SSLStatus::DISPLAYED_INSECURE_CONTENT) {
-        // HTTPS with mixed content.
+        // HTTPS with mixed content. This maps to the NONE security level. Show
+        // the grey triangle icon in page info based on the same logic used to
+        // determine the iconography in the omnibox.
+        if (security_state::ShouldDowngradeNeutralStyling(
+                security_state::SecurityLevel::NONE, url,
+                base::BindRepeating(&web::IsOriginSecure))) {
+          icon_id = ICON_STATE_ERROR;
+        } else {
           icon_id = ICON_STATE_INFO;
+        }
         summary.assign(
             l10n_util::GetStringUTF16(IDS_PAGE_INFO_MIXED_CONTENT_SUMMARY));
         details.assign(