autocomplete: add ability to get full address (hidden behind a flag).

chrome/browser/ui/autofill/autofill_dialog_controller_impl.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 "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 36 matching lines @@
 #include "components/autofill/content/browser/risk/fingerprint.h"
 #include "components/autofill/content/browser/risk/proto/fingerprint.pb.h"
 #include "components/autofill/content/browser/wallet/form_field_error.h"
 #include "components/autofill/content/browser/wallet/full_wallet.h"
 #include "components/autofill/content/browser/wallet/gaia_account.h"
 #include "components/autofill/content/browser/wallet/instrument.h"
 #include "components/autofill/content/browser/wallet/wallet_address.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
 #include "components/autofill/content/browser/wallet/wallet_service_url.h"
 #include "components/autofill/content/browser/wallet/wallet_signin_helper.h"
+#include "components/autofill/core/browser/address_i18n.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_data_model.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/user_prefs/pref_registry_syncable.h"
@@ skipping 437 matching lines @@
     return rb.GetImageNamed(IDR_CREDIT_CARD_CVC_HINT_AMEX);
 
   return rb.GetImageNamed(IDR_CREDIT_CARD_CVC_HINT);
 }
 
 ServerFieldType CountryTypeForSection(DialogSection section) {
   return section == SECTION_SHIPPING ? ADDRESS_HOME_COUNTRY :
                                        ADDRESS_BILLING_COUNTRY;
 }
 
-// profile.GetInfo() thunk.
-base::string16 GetInfoFromProfile(const AutofillProfile& profile,
-                                  const AutofillType& type) {
-  return profile.GetInfo(type, g_browser_process->GetApplicationLocale());
-}
-
 // Attempts to canonicalize the administrative area name in |profile| using the
 // rules in |validator|.
 void CanonicalizeState(const AddressValidator* validator,
                        AutofillProfile* profile) {
   base::string16 administrative_area;
-  AddressData address_data;
-  i18ninput::CreateAddressData(base::Bind(&GetInfoFromProfile, *profile),
-                               &address_data);
+  scoped_ptr<AddressData> address_data =
+      i18n::CreateAddressDataFromAutofillProfile(
+          *profile, g_browser_process->GetApplicationLocale());
 
-  validator->CanonicalizeAdministrativeArea(&address_data);
-  administrative_area = base::UTF8ToUTF16(address_data.administrative_area);
+  validator->CanonicalizeAdministrativeArea(address_data.get());
+  administrative_area = base::UTF8ToUTF16(address_data->administrative_area);
 
   profile->SetInfo(AutofillType(ADDRESS_HOME_STATE),
                    administrative_area,
                    g_browser_process->GetApplicationLocale());
 }
 
 ValidityMessage GetPhoneValidityMessage(const base::string16& country_name,
                                         const base::string16& number) {
   std::string region = AutofillCountry::GetCountryCode(
       country_name,
@@ skipping 1407 matching lines @@
     DialogSection section,
     const FieldValueMap& inputs) {
   ValidityMessages messages;
   if (inputs.empty())
     return messages;
 
   AddressValidator::Status status = AddressValidator::SUCCESS;
   if (section != SECTION_CC) {
     AutofillProfile profile;
     FillFormGroupFromOutputs(inputs, &profile);
-    AddressData address_data;
-    i18ninput::CreateAddressData(base::Bind(&GetInfoFromProfile, profile),
-                                 &address_data);
-    address_data.language_code = AddressLanguageCodeForSection(section);
+    scoped_ptr<AddressData> address_data =
+        i18n::CreateAddressDataFromAutofillProfile(
+            profile, g_browser_process->GetApplicationLocale());
+    address_data->language_code = AddressLanguageCodeForSection(section);
 
     AddressProblems problems;
-    status = GetValidator()->ValidateAddress(address_data,
+    status = GetValidator()->ValidateAddress(*address_data,
                                              AddressProblemFilter(),
                                              &problems);
     common::AddressType address_type = section == SECTION_SHIPPING ?
         common::ADDRESS_TYPE_SHIPPING : common::ADDRESS_TYPE_BILLING;
     for (size_t i = 0; i < problems.size(); ++i) {
       const AddressProblem& problem = problems[i];
       bool sure = problem.type != AddressProblem::MISSING_REQUIRED_FIELD;
       base::string16 text = l10n_util::GetStringUTF16(problem.description_id);
       messages.Set(i18ninput::TypeForField(problem.field, address_type),
                    ValidityMessage(text, sure));
@@ skipping 1045 matching lines @@
             cards[i]->Label(),
             rb.GetImageNamed(CreditCard::IconResourceId(cards[i]->type())));
       }
 
       const std::vector<AutofillProfile*>& profiles = manager->GetProfiles();
       std::vector<base::string16> labels;
       AutofillProfile::CreateDifferentiatingLabels(profiles, &labels);
       DCHECK_EQ(labels.size(), profiles.size());
       for (size_t i = 0; i < profiles.size(); ++i) {
         const AutofillProfile& profile = *profiles[i];
-        if (!i18ninput::AddressHasCompleteAndVerifiedData(profile) ||
+        if (!i18ninput::AddressHasCompleteAndVerifiedData(
+                profile, g_browser_process->GetApplicationLocale()) ||
             !i18ninput::CountryIsFullySupported(
                 base::UTF16ToASCII(profile.GetRawInfo(ADDRESS_HOME_COUNTRY)))) {
           continue;
         }
 
         // Don't add variants for addresses: name is part of credit card and
         // we'll just ignore email and phone number variants.
         suggested_shipping_.AddKeyedItem(profile.guid(), labels[i]);
         suggested_shipping_.SetEnabled(
             profile.guid(),
@@ skipping 300 matching lines @@
   AddressField focused_field;
   if (!i18ninput::FieldForType(type, &focused_field))
     return;
 
   FieldValueMap inputs;
   view_->GetUserInput(section, &inputs);
 
   AutofillProfile profile;
   FillFormGroupFromOutputs(inputs, &profile);
 
-  AddressData user_input;
-  i18ninput::CreateAddressData(
-      base::Bind(&GetInfoFromProfile, profile), &user_input);
-  user_input.language_code = AddressLanguageCodeForSection(section);
+  scoped_ptr<AddressData> user_input =
+      i18n::CreateAddressDataFromAutofillProfile(
+          profile, g_browser_process->GetApplicationLocale());
+  user_input->language_code = AddressLanguageCodeForSection(section);
 
   static const size_t kSuggestionsLimit = 10;
   AddressValidator::Status status = GetValidator()->GetSuggestions(
-      user_input, focused_field, kSuggestionsLimit,
+      *user_input, focused_field, kSuggestionsLimit,
       &i18n_validator_suggestions_);
 
   if (status != AddressValidator::SUCCESS)
     return;
 
   for (size_t i = 0; i < i18n_validator_suggestions_.size(); ++i) {
     popup_values->push_back(base::UTF8ToUTF16(
         i18n_validator_suggestions_[i].GetFieldValue(focused_field)));
 
     // Disambiguate the suggestion by showing the smallest administrative
@@ skipping 196 matching lines @@
       // by the Online Wallet server, mark it invalid on selection.
       return false;
     }
   }
 
   return true;
 }
 
 bool AutofillDialogControllerImpl::HasInvalidAddress(
     const AutofillProfile& profile) {
-  AddressData address_data;
-  i18ninput::CreateAddressData(base::Bind(&GetInfoFromProfile, profile),
-                               &address_data);
+  scoped_ptr<AddressData> address_data =
+      i18n::CreateAddressDataFromAutofillProfile(
+          profile, g_browser_process->GetApplicationLocale());
 
   AddressProblems problems;
-  GetValidator()->ValidateAddress(address_data,
+  GetValidator()->ValidateAddress(*address_data,
                                   AddressProblemFilter(),
                                   &problems);
   return !problems.empty();
 }
 
 bool AutofillDialogControllerImpl::ShouldUseBillingForShipping() {
   return SectionIsActive(SECTION_SHIPPING) &&
       suggested_shipping_.GetItemKeyForCheckedItem() == kSameAsBillingKey;
 }
 
@@ skipping 480 matching lines @@
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::FetchWalletCookie() {
   net::URLRequestContextGetter* request_context = profile_->GetRequestContext();
   signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context));
   signin_helper_->StartWalletCookieValueFetch();
 }
 
 }  // namespace autofill