Index: components/autofill/core/browser/autofill_manager.cc |
diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc |
index 68d2a361e98cdff996d11e5d7def52bbd4fa7053..7a96bb9a3e16eee1afbd265c4319cf7a00045826 100644 |
--- a/components/autofill/core/browser/autofill_manager.cc |
+++ b/components/autofill/core/browser/autofill_manager.cc |
@@ -461,7 +461,7 @@ void AutofillManager::OnQueryFormFieldAutofill(int query_id, |
field, type, &values, &labels, &icons, &unique_ids); |
} else { |
GetProfileSuggestions( |
- form_structure, field, type, &values, &labels, &icons, &unique_ids); |
+ *form_structure, field, type, &values, &labels, &icons, &unique_ids); |
} |
DCHECK_EQ(values.size(), labels.size()); |
@@ -473,9 +473,7 @@ void AutofillManager::OnQueryFormFieldAutofill(int query_id, |
// provide credit card suggestions for non-HTTPS pages. However, provide a |
// warning to the user in these cases. |
int warning = 0; |
- if (!form_structure->IsAutofillable()) |
- warning = IDS_AUTOFILL_WARNING_FORM_DISABLED; |
- else if (is_filling_credit_card && !FormIsHTTPS(*form_structure)) |
+ if (is_filling_credit_card && !FormIsHTTPS(*form_structure)) |
warning = IDS_AUTOFILL_WARNING_INSECURE_CONNECTION; |
if (warning) { |
values.assign(1, l10n_util::GetStringUTF16(warning)); |
@@ -1070,16 +1068,16 @@ bool AutofillManager::UpdateCachedForm(const FormData& live_form, |
} |
void AutofillManager::GetProfileSuggestions( |
- FormStructure* form, |
+ const FormStructure& form, |
const FormFieldData& field, |
const AutofillType& type, |
std::vector<base::string16>* values, |
std::vector<base::string16>* labels, |
std::vector<base::string16>* icons, |
std::vector<int>* unique_ids) const { |
- std::vector<ServerFieldType> field_types(form->field_count()); |
- for (size_t i = 0; i < form->field_count(); ++i) { |
- field_types.push_back(form->field(i)->Type().GetStorableType()); |
+ std::vector<ServerFieldType> field_types(form.field_count()); |
+ for (size_t i = 0; i < form.field_count(); ++i) { |
+ field_types.push_back(form.field(i)->Type().GetStorableType()); |
} |
std::vector<GUIDPair> guid_pairs; |