Componentize autofill dialog common code

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/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/detail_input.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
+#include "components/autofill/core/browser/server_field_types_util.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/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/geolocation_provider.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 109 matching lines @@
   return info;
 }
 
 // Returns true if |input| should be used to fill a site-requested |field| which
 // is notated with a "shipping" tag, for use when the user has decided to use
 // the billing address as the shipping address.
 bool ServerTypeMatchesShippingField(ServerFieldType type,
                                     const AutofillField& field) {
   // Equivalent billing field type is used to support UseBillingAsShipping
   // usecase.
-  return common::ServerTypeEncompassesFieldType(
-      type,
-      AutofillType(AutofillType::GetEquivalentBillingFieldType(
-          field.Type().GetStorableType())));
+  return ServerTypeEncompassesFieldType(
+      type, AutofillType(AutofillType::GetEquivalentBillingFieldType(
+                field.Type().GetStorableType())));
 }
 
 // Initializes |form_group| from user-entered data.
 void FillFormGroupFromOutputs(const FieldValueMap& detail_outputs,
                               FormGroup* form_group) {
   for (FieldValueMap::const_iterator iter = detail_outputs.begin();
        iter != detail_outputs.end(); ++iter) {
     ServerFieldType type = iter->first;
     if (!iter->second.empty()) {
       form_group->SetInfo(AutofillType(type),
@@ skipping 13 matching lines @@
   for (FieldValueMap::const_iterator it = output.begin();
        it != output.end(); ++it) {
     const ServerFieldType type = it->first;
     base::string16 trimmed;
     base::TrimWhitespace(it->second, base::TRIM_ALL, &trimmed);
 
     // Special case CVC as CreditCard just swallows it.
     if (type == CREDIT_CARD_VERIFICATION_CODE) {
       if (cvc)
         cvc->assign(trimmed);
-    } else if (common::IsCreditCardType(type)) {
+    } else if (IsCreditCardType(type)) {
       card->SetRawInfo(type, trimmed);
     } else {
       // Copy the credit card name to |profile| in addition to |card| as
       // wallet::Instrument requires a recipient name for its billing address.
       if (card && type == NAME_FULL)
         card->SetRawInfo(CREDIT_CARD_NAME, trimmed);
 
       if (profile) {
         profile->SetInfo(AutofillType(AutofillType(type).GetStorableType()),
                          trimmed,
@@ skipping 331 matching lines @@
   };
 
   const DetailInput kShippingPhoneInputs[] = {
     { DetailInput::LONG,
       PHONE_HOME_WHOLE_NUMBER,
       GetStringUTF16(IDS_AUTOFILL_DIALOG_PLACEHOLDER_PHONE_NUMBER) },
   };
 
   switch (dialog_section) {
     case SECTION_CC: {
-      common::BuildInputs(kCCInputs, arraysize(kCCInputs), inputs);
+      BuildInputs(kCCInputs, arraysize(kCCInputs), inputs);
       break;
     }
 
     case SECTION_BILLING: {
       i18ninput::BuildAddressInputs(common::ADDRESS_TYPE_BILLING,
                                     country_code, inputs, language_code);
-      common::BuildInputs(kBillingPhoneInputs, arraysize(kBillingPhoneInputs),
-                          inputs);
-      common::BuildInputs(kEmailInputs, arraysize(kEmailInputs), inputs);
+      BuildInputs(kBillingPhoneInputs, arraysize(kBillingPhoneInputs), inputs);
+      BuildInputs(kEmailInputs, arraysize(kEmailInputs), inputs);
       break;
     }
 
     case SECTION_CC_BILLING: {
-      common::BuildInputs(kCCInputs, arraysize(kCCInputs), inputs);
+      BuildInputs(kCCInputs, arraysize(kCCInputs), inputs);
 
       // Wallet only supports US billing addresses.
       const std::string hardcoded_country_code = "US";
       i18ninput::BuildAddressInputs(common::ADDRESS_TYPE_BILLING,
                                     hardcoded_country_code,
                                     inputs,
                                     language_code);
       DCHECK_EQ(inputs->back().type, ADDRESS_BILLING_COUNTRY);
       inputs->back().length = DetailInput::NONE;
       const std::string& app_locale =
           g_browser_process->GetApplicationLocale();
       inputs->back().initial_value =
           AutofillCountry(hardcoded_country_code, app_locale).name();
 
-      common::BuildInputs(kBillingPhoneInputs, arraysize(kBillingPhoneInputs),
-                          inputs);
+      BuildInputs(kBillingPhoneInputs, arraysize(kBillingPhoneInputs), inputs);
       break;
     }
 
     case SECTION_SHIPPING: {
       i18ninput::BuildAddressInputs(common::ADDRESS_TYPE_SHIPPING,
                                     country_code, inputs, language_code);
-      common::BuildInputs(kShippingPhoneInputs, arraysize(kShippingPhoneInputs),
-                          inputs);
+      BuildInputs(kShippingPhoneInputs, arraysize(kShippingPhoneInputs),
+                  inputs);
       break;
     }
   }
 }
 
 }  // namespace
 
 AutofillDialogViewDelegate::~AutofillDialogViewDelegate() {}
 
 AutofillDialogControllerImpl::~AutofillDialogControllerImpl() {
@@ skipping 179 matching lines @@
     DetailInputs* inputs = MutableRequestedFieldsForSection(section);
     BuildInputsForSection(
         section, country_code, inputs,
         MutableAddressLanguageCodeForSection(section));
   }
 
   // Test whether we need to show the shipping section. If filling that section
   // would be a no-op, don't show it.
   cares_about_shipping_ = form_structure_.FillFields(
       RequestedTypesForSection(SECTION_SHIPPING),
-      base::Bind(common::ServerTypeMatchesField, SECTION_SHIPPING),
-      base::Bind(NullGetInfo),
-      std::string(),
+      base::Bind(ServerTypeMatchesField, SECTION_SHIPPING),
+      base::Bind(NullGetInfo), std::string(),
       g_browser_process->GetApplicationLocale());
 
   transaction_amount_ = form_structure_.GetUniqueValue(
       HTML_TYPE_TRANSACTION_AMOUNT);
   transaction_currency_ = form_structure_.GetUniqueValue(
       HTML_TYPE_TRANSACTION_CURRENCY);
 
   account_chooser_model_.reset(
       new AccountChooserModel(this, profile_, !ShouldShowAccountChooser()));
 
@@ skipping 1268 matching lines @@
 
   // If the user clicks while the popup is already showing, be sure to hide
   // it.
   if (!was_edit && popup_controller_.get()) {
     HidePopup();
     return;
   }
 
   std::vector<autofill::Suggestion> popup_suggestions;
   popup_suggestion_ids_.clear();
-  if (common::IsCreditCardType(type)) {
+  if (IsCreditCardType(type)) {
     popup_suggestions = GetManager()->GetCreditCardSuggestions(
         AutofillType(type), field_contents);
     for (const auto& suggestion : popup_suggestions)
       popup_suggestion_ids_.push_back(suggestion.backend_id);
   } else {
     popup_suggestions = GetManager()->GetProfileSuggestions(
         AutofillType(type),
         field_contents,
         false,
         RequestedTypesForSection(section));
@@ skipping 268 matching lines @@
   DCHECK_NE(UNKNOWN_TYPE, popup_input_type_);
   // Because |HidePopup()| can be called from |UpdateSection()|, remember the
   // type of the input for later here.
   const ServerFieldType popup_input_type = popup_input_type_;
 
   ScopedViewUpdates updates(view_.get());
   scoped_ptr<DataModelWrapper> wrapper;
 
   if (static_cast<size_t>(identifier) < popup_suggestion_ids_.size()) {
     const SuggestionBackendID& sid = popup_suggestion_ids_[identifier];
-    if (common::IsCreditCardType(popup_input_type)) {
+    if (IsCreditCardType(popup_input_type)) {
       wrapper.reset(new AutofillCreditCardWrapper(
           GetManager()->GetCreditCardByGUID(sid.guid)));
     } else {
       wrapper.reset(new AutofillProfileWrapper(
           GetManager()->GetProfileByGUID(sid.guid),
           AutofillType(popup_input_type),
           sid.variant));
     }
   } else {
     wrapper.reset(new I18nAddressDataWrapper(
@@ skipping 751 matching lines @@
 void AutofillDialogControllerImpl::FillOutputForSectionWithComparator(
     DialogSection section,
     const FormStructure::InputFieldComparator& compare) {
   if (!SectionIsActive(section))
     return;
 
   DetailInputs inputs;
   std::string country_code = CountryCodeForSection(section);
   BuildInputsForSection(section, country_code, &inputs,
                         MutableAddressLanguageCodeForSection(section));
-  std::vector<ServerFieldType> types = common::TypesFromInputs(inputs);
+  std::vector<ServerFieldType> types = TypesFromInputs(inputs);
 
   scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section);
   if (wrapper) {
     // Only fill in data that is associated with this section.
     wrapper->FillFormStructure(types, compare, &form_structure_);
 
     // CVC needs special-casing because the CreditCard class doesn't store or
     // handle them. This isn't necessary when filling the combined CC and
     // billing section as CVC comes from |full_wallet_| in this case.
     if (section == SECTION_CC)
@@ skipping 50 matching lines @@
       }
 
       AutofillProfileWrapper profile_wrapper(&profile);
       profile_wrapper.FillFormStructure(types, compare, &form_structure_);
     }
   }
 }
 
 void AutofillDialogControllerImpl::FillOutputForSection(DialogSection section) {
   FillOutputForSectionWithComparator(
-      section, base::Bind(common::ServerTypeMatchesField, section));
+      section, base::Bind(ServerTypeMatchesField, section));
 }
 
 bool AutofillDialogControllerImpl::FormStructureCaresAboutSection(
     DialogSection section) const {
   // For now, only SECTION_SHIPPING may be omitted due to a site not asking for
   // any of the fields.
   if (section == SECTION_SHIPPING)
     return cares_about_shipping_;
 
   return true;
@@ skipping 166 matching lines @@
 }
 
 std::string AutofillDialogControllerImpl::AddressLanguageCodeForSection(
     DialogSection section) {
   std::string* language_code = MutableAddressLanguageCodeForSection(section);
   return language_code != NULL ? *language_code : std::string();
 }
 
 std::vector<ServerFieldType> AutofillDialogControllerImpl::
     RequestedTypesForSection(DialogSection section) const {
-  return common::TypesFromInputs(RequestedFieldsForSection(section));
+  return TypesFromInputs(RequestedFieldsForSection(section));
 }
 
 std::string AutofillDialogControllerImpl::CountryCodeForSection(
     DialogSection section) {
   base::string16 country;
 
   scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section);
   if (wrapper) {
     country = wrapper->GetInfo(AutofillType(CountryTypeForSection(section)));
   } else {
@@ skipping 673 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