HTTP Bad: Add warning message to autofill dropdown for http sites

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 43 matching lines @@
 #include "components/autofill/core/common/autofill_data_validation.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/autofill_util.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_data_predictions.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/rappor/rappor_utils.h"
+#include "components/security_state/switches.h"
 #include "google_apis/gaia/identity_provider.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/rect.h"
 #include "url/gurl.h"
 
 #if defined(OS_IOS)
 #include "components/autofill/core/browser/keyboard_accessory_metrics_logger.h"
 #endif
 
@@ skipping 488 matching lines @@
         AutofillMetrics::LogIsQueriedCreditCardFormSecure(is_context_secure);
 
       // Don't provide credit card suggestions for non-secure pages, but do
       // provide them for secure pages with passive mixed content (see impl. of
       // IsContextSecure).
       if (is_filling_credit_card && !is_context_secure) {
         Suggestion warning_suggestion(l10n_util::GetStringUTF16(
             IDS_AUTOFILL_WARNING_INSECURE_CONNECTION));
         warning_suggestion.frontend_id = POPUP_ITEM_ID_WARNING_MESSAGE;
         suggestions.assign(1, warning_suggestion);
+
+        std::string choice =
+            base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+                security_state::switches::kMarkHttpAs);
+        if (choice ==
+            security_state::switches::kMarkHttpWithPasswordsOrCcWithChip) {

[estark, 2016/11/07 06:06:57]

Drive-by: this should be the new switch, right?
(kMarkHttpWithPasswordsOrCcWithChipAndFormWarning)

[lshang, 2016/11/07 06:12:12]

Done. Yeah I've rebased and changed to use the new switch.

+          autofill::Suggestion cc_field_http_warning_suggestion(
+              l10n_util::GetStringUTF16(
+                  IDS_AUTOFILL_CREDIT_CARD_HTTP_WARNING_MESSAGE));
+          cc_field_http_warning_suggestion.frontend_id =
+              autofill::POPUP_ITEM_ID_WARNING_MESSAGE;
+          suggestions.insert(suggestions.begin(),
+                             cc_field_http_warning_suggestion);
+        }
       } 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
           // suggestions.
@@ skipping 1508 matching lines @@
     if (i > 0)
       fputs("Next oldest form:\n", file);
   }
   fputs("\n", file);
 
   fclose(file);
 }
 #endif  // ENABLE_FORM_DEBUG_DUMP
 
 }  // namespace autofill