Rename location bar icon types and images

Rename INSECURE to INFO and DANGEROUS to NOT_SECURE_WARNING. The
eventual goal is to use the info icon to convey site information
and a grey triangle icon to indicate non-secure connections
(crbug.com/1008219). Thus, this cl renames the info icon to be more
descriptive and the danger icon to be more general.

Bug: 1008219
Change-Id: Id012ec42d4c6ec75e4f7aee4247029b89b4d704a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1876129Reviewed-by: Stepan Khapugin <stkhapugin@chromium.org>
Commit-Queue: Livvie Lin <livvielin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709054}

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

@@ -19,8 +19,8 @@ source_set("location_bar") {
   ]
   deps = [
     ":constants",
-    "resources:location_bar_dangerous",
-    "resources:location_bar_insecure",
+    "resources:location_bar_info",
+    "resources:location_bar_not_secure_warning",
     "resources:location_bar_offline",
     "resources:location_bar_secure",
     "resources:location_bar_share",

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

@@ -85,20 +85,20 @@ imageset("location_bar_secure") {
   ]
 }
 
-imageset("location_bar_dangerous") {
+imageset("location_bar_not_secure_warning") {
   sources = [
-    "location_bar_dangerous.imageset/Contents.json",
-    "location_bar_dangerous.imageset/location_bar_dangerous.png",
-    "location_bar_dangerous.imageset/location_bar_dangerous@2x.png",
-    "location_bar_dangerous.imageset/location_bar_dangerous@3x.png",
+    "location_bar_not_secure_warning.imageset/Contents.json",
+    "location_bar_not_secure_warning.imageset/location_bar_not_secure_warning.png",
+    "location_bar_not_secure_warning.imageset/location_bar_not_secure_warning@2x.png",
+    "location_bar_not_secure_warning.imageset/location_bar_not_secure_warning@3x.png",
   ]
 }
 
-imageset("location_bar_insecure") {
+imageset("location_bar_info") {
   sources = [
-    "location_bar_insecure.imageset/Contents.json",
-    "location_bar_insecure.imageset/location_bar_insecure.png",
-    "location_bar_insecure.imageset/location_bar_insecure@2x.png",
-    "location_bar_insecure.imageset/location_bar_insecure@3x.png",
+    "location_bar_info.imageset/Contents.json",
+    "location_bar_info.imageset/location_bar_info.png",
+    "location_bar_info.imageset/location_bar_info@2x.png",
+    "location_bar_info.imageset/location_bar_info@3x.png",
   ]
 }

ios/chrome/browser/ui/location_bar/resources/location_bar_insecure.imageset/Contents.json → ios/chrome/browser/ui/location_bar/resources/location_bar_info.imageset/Contents.json

@@ -3,17 +3,17 @@
         {
             "idiom": "universal",
             "scale": "1x",
-            "filename": "location_bar_insecure.png"
+            "filename": "location_bar_info.png"
         },
         {
             "idiom": "universal",
             "scale": "2x",
-            "filename": "location_bar_insecure@2x.png"
+            "filename": "location_bar_info@2x.png"
         },
         {
             "idiom": "universal",
             "scale": "3x",
-            "filename": "location_bar_insecure@3x.png"
+            "filename": "location_bar_info@3x.png"
         }
     ],
     "info": {

ios/chrome/browser/ui/location_bar/resources/location_bar_dangerous.imageset/Contents.json → ios/chrome/browser/ui/location_bar/resources/location_bar_not_secure_warning.imageset/Contents.json

@@ -3,17 +3,17 @@
         {
             "idiom": "universal",
             "scale": "1x",
-            "filename": "location_bar_dangerous.png"
+            "filename": "location_bar_not_secure_warning.png"
         },
         {
             "idiom": "universal",
             "scale": "2x",
-            "filename": "location_bar_dangerous@2x.png"
+            "filename": "location_bar_not_secure_warning@2x.png"
         },
         {
             "idiom": "universal",
             "scale": "3x",
-            "filename": "location_bar_dangerous@3x.png"
+            "filename": "location_bar_not_secure_warning@3x.png"
         }
     ],
     "info": {

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

@@ -9,9 +9,9 @@
 
 // All available icons for security states.
 enum LocationBarSecurityIconType {
-  INSECURE = 0,
+  INFO = 0,
   SECURE,
-  DANGEROUS,
+  NOT_SECURE_WARNING,
   LOCATION_BAR_SECURITY_ICON_TYPE_COUNT,
 };
 

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

@@ -13,14 +13,14 @@
 NSString* GetLocationBarSecurityIconTypeAssetName(
     LocationBarSecurityIconType iconType) {
   switch (iconType) {
-    case INSECURE:
-      return @"location_bar_insecure";
+    case INFO:
+      return @"location_bar_info";
     case SECURE:
       return @"location_bar_secure";
-    case DANGEROUS:
-      return @"location_bar_dangerous";
+    case NOT_SECURE_WARNING:
+      return @"location_bar_not_secure_warning";
     case LOCATION_BAR_SECURITY_ICON_TYPE_COUNT:
       NOTREACHED();
-      return @"location_bar_insecure";
+      return @"location_bar_info";
   }
 }

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

@@ -91,13 +91,13 @@ LocationBarSecurityIconType GetLocationBarSecurityIconTypeForSecurityState(
   switch (security_level) {
     case security_state::NONE:
     case security_state::WARNING:
-      return INSECURE;
+      return INFO;
     case security_state::EV_SECURE:
     case security_state::SECURE:
     case security_state::SECURE_WITH_POLICY_INSTALLED_CERT:
       return SECURE;
     case security_state::DANGEROUS:
-      return DANGEROUS;
+      return NOT_SECURE_WARNING;
     case security_state::SECURITY_LEVEL_COUNT:
       NOTREACHED();
       return LOCATION_BAR_SECURITY_ICON_TYPE_COUNT;