Http Bad: Add icons to the http warning message

components/autofill/core/browser/autofill_manager.cc

 // Copyright 2013 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.
 
 #include "components/autofill/core/browser/autofill_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 165 matching lines @@
 }
 
 bool IsCreditCardExpirationType(ServerFieldType type) {
   return type == CREDIT_CARD_EXP_MONTH ||
          type == CREDIT_CARD_EXP_2_DIGIT_YEAR ||
          type == CREDIT_CARD_EXP_4_DIGIT_YEAR ||
          type == CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR ||
          type == CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR;
 }
 
+// Create http bad warning message at the top of autofill popup list showing
+// "Payment not secure" when users are on http sites or broken https sites.
+Suggestion CreateHttpWarningMessageSuggestionItem(const GURL& source_url) {
+  std::string icon_str;
+
+  // Show http warning icon for http sites.
+  if (source_url.is_valid() && source_url.SchemeIs("http")) {
+    icon_str = "httpWarning";
+  } else {
+    // Show https_invalid icon for broken https sites.
+    icon_str = "httpsInvalid";
+  }
+
+  return Suggestion(
+      l10n_util::GetStringUTF8(IDS_AUTOFILL_CREDIT_CARD_HTTP_WARNING_MESSAGE),

[Evan Stade, 2016/11/28 16:12:02]

nit: the documentation for Suggestion says this constructor is for tests only.
Can you construct it in a way more similar to the code you deleted further down?

[lshang, 2016/11/29 10:07:35]

Done.

+      std::string(), icon_str, POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE);
+}
+
 }  // namespace
 
 AutofillManager::AutofillManager(
     AutofillDriver* driver,
     AutofillClient* client,
     const std::string& app_locale,
     AutofillDownloadManagerState enable_download_manager)
     : driver_(driver),
       client_(client),
       payments_client_(
@@ skipping 373 matching lines @@
         // Autofill is disabled for a website.
         Suggestion warning_suggestion(l10n_util::GetStringUTF16(
             IDS_AUTOFILL_WARNING_INSECURE_CONNECTION));
         warning_suggestion.frontend_id =
             POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE;
         suggestions.assign(1, warning_suggestion);
 
         // On top of the explanation message, first show a "Payment not secure"
         // message.
         if (IsCreditCardAutofillHttpWarningEnabled()) {
-          Suggestion cc_field_http_warning_suggestion(l10n_util::GetStringUTF16(
-              IDS_AUTOFILL_CREDIT_CARD_HTTP_WARNING_MESSAGE));
-          cc_field_http_warning_suggestion.frontend_id =
-              POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE;
           suggestions.insert(suggestions.begin(),
-                             cc_field_http_warning_suggestion);
+                             CreateHttpWarningMessageSuggestionItem(
+                                 form_structure->source_url()));
         }
       } else {
         bool section_is_autofilled =
             SectionIsAutofilled(*form_structure, form,
                                 autofill_field->section());
         if (section_is_autofilled) {
           // If the relevant section is auto-filled and the renderer is querying
           // for suggestions, then the user is editing the value of a field.
           // In this case, mimic autocomplete: don't display labels or icons,
           // as that information is redundant. Moreover, filter out duplicate
@@ skipping 1509 matching lines @@
     if (i > 0)
       fputs("Next oldest form:\n", file);
   }
   fputs("\n", file);
 
   fclose(file);
 }
 #endif  // ENABLE_FORM_DEBUG_DUMP
 
 }  // namespace autofill