Adjust displayed phone number for prefix/suffix case.

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 <limits>
 #include <map>
@@ skipping 446 matching lines @@
       driver_->RendererIsAvailable() &&
       GetCachedFormAndField(form, field, &form_structure, &autofill_field) &&
       // Don't send suggestions for forms that aren't auto-fillable.
       form_structure->IsAutofillable()) {
     AutofillType type = autofill_field->Type();
     bool is_filling_credit_card = (type.group() == CREDIT_CARD);
     if (is_filling_credit_card) {
       GetCreditCardSuggestions(
           field, type, &values, &labels, &icons, &unique_ids);
     } else {
-      GetProfileSuggestions(
-          *form_structure, field, type, &values, &labels, &icons, &unique_ids);
+      GetProfileSuggestions(*form_structure,
+                            field,
+                            *autofill_field,
+                            &values,
+                            &labels,
+                            &icons,
+                            &unique_ids);
     }
 
     DCHECK_EQ(values.size(), labels.size());
     DCHECK_EQ(values.size(), icons.size());
     DCHECK_EQ(values.size(), unique_ids.size());
 
     if (!values.empty()) {
       // Don't provide Autofill suggestions when Autofill is disabled, and don't
       // provide credit card suggestions for non-HTTPS pages. However, provide a
       // warning to the user in these cases.
@@ skipping 588 matching lines @@
   // Annotate the updated form with its predicted types.
   std::vector<FormStructure*> forms(1, *updated_form);
   driver_->SendAutofillTypePredictionsToRenderer(forms);
 
   return true;
 }
 
 void AutofillManager::GetProfileSuggestions(
     const FormStructure& form,
     const FormFieldData& field,
-    const AutofillType& type,
+    const AutofillField& autofill_field,
     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<GUIDPair> guid_pairs;
 
   personal_data_->GetProfileSuggestions(
-      type, field.value, field.is_autofilled, field_types,
+      autofill_field.Type(), field.value, field.is_autofilled, field_types,
       base::Callback<bool(const AutofillProfile&)>(),
       values, labels, icons, &guid_pairs);
 
+  // Adjust phone number to display in prefix/suffix case.
+  if (autofill_field.Type().GetStorableType() == PHONE_HOME_NUMBER) {
+    for (size_t i = 0; i < values->size(); ++i) {
+      (*values)[i] = AutofillField::GetPhoneNumberValue(
+          autofill_field, (*values)[i], field);
+    }
+  }
+
   for (size_t i = 0; i < guid_pairs.size(); ++i) {
     unique_ids->push_back(PackGUIDs(GUIDPair(std::string(), 0),
                                     guid_pairs[i]));
   }
 }
 
 void AutofillManager::GetCreditCardSuggestions(
     const FormFieldData& field,
     const AutofillType& type,
     std::vector<base::string16>* values,
@@ skipping 120 matching lines @@
     return false;
 
   // Disregard forms that we wouldn't ever autofill in the first place.
   if (!form.ShouldBeParsed())
     return false;
 
   return true;
 }
 
 }  // namespace autofill