Componentize autofill dialog common code

chrome/browser/ui/android/autofill/autofill_dialog_controller_android.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/android/autofill/autofill_dialog_controller_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h"
 #include "chrome/browser/ui/android/window_android_helper.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_common.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/autofill/content/browser/wallet/full_wallet.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/detail_input.h"
+#include "components/autofill/core/browser/dialog_section.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
+#include "components/autofill/core/browser/server_field_types_util.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/pref_registry/pref_registry_syncable.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/web_contents.h"
 #include "jni/AutofillDialogControllerAndroid_jni.h"
 #include "ui/android/window_android.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/models/menu_model.h"
@@ skipping 24 matching lines @@
     { DetailInput::LONG, ADDRESS_BILLING_STATE },
     { DetailInput::LONG, ADDRESS_BILLING_ZIP },
     { DetailInput::LONG, ADDRESS_BILLING_SORTING_CODE },
     { DetailInput::LONG, ADDRESS_BILLING_COUNTRY },
     { DetailInput::LONG, PHONE_BILLING_WHOLE_NUMBER },
     { DetailInput::LONG, CREDIT_CARD_NUMBER },
     { DetailInput::LONG, CREDIT_CARD_EXP_MONTH },
     { DetailInput::LONG, CREDIT_CARD_EXP_4_DIGIT_YEAR },
     { DetailInput::LONG, CREDIT_CARD_VERIFICATION_CODE },
   };
-  common::BuildInputs(kCcBillingInputs, arraysize(kCcBillingInputs), inputs);
+  BuildInputs(kCcBillingInputs, arraysize(kCcBillingInputs), inputs);
 }
 
 // Constructs |inputs| for the SECTION_SHIPPING section.
 void BuildShippingInputs(DetailInputs* inputs) {
   const DetailInput kShippingInputs[] = {
     { DetailInput::LONG, NAME_FULL },
     { DetailInput::LONG, ADDRESS_HOME_STREET_ADDRESS },
     { DetailInput::LONG, ADDRESS_HOME_CITY },
     { DetailInput::LONG, ADDRESS_HOME_DEPENDENT_LOCALITY },
     { DetailInput::LONG, ADDRESS_HOME_STATE },
     { DetailInput::LONG, ADDRESS_HOME_ZIP },
     { DetailInput::LONG, ADDRESS_HOME_SORTING_CODE },
     { DetailInput::LONG, ADDRESS_HOME_COUNTRY },
     { DetailInput::LONG, PHONE_HOME_WHOLE_NUMBER },
   };
-  common::BuildInputs(kShippingInputs, arraysize(kShippingInputs), inputs);
+  BuildInputs(kShippingInputs, arraysize(kShippingInputs), inputs);
 }
 
 base::string16 NullGetInfo(const AutofillType& type) {
   return base::string16();
 }
 
 void FillOutputForSectionWithComparator(
     DialogSection section,
     const DetailInputs& inputs,
     const FormStructure::InputFieldComparator& compare,
     FormStructure& form_structure,
     FullWallet* full_wallet,
     const base::string16& email_address) {
   if ((section == SECTION_CC_BILLING && !full_wallet->billing_address()) ||
       (section == SECTION_SHIPPING && !full_wallet->shipping_address())) {
     return;
   }
 
   base::Callback<base::string16(const AutofillType&)> get_info =
       base::Bind(&FullWallet::GetInfo,
                  base::Unretained(full_wallet),
                  g_browser_process->GetApplicationLocale());
 
-  std::vector<ServerFieldType> types = common::TypesFromInputs(inputs);
+  std::vector<ServerFieldType> types = TypesFromInputs(inputs);
   form_structure.FillFields(
       types,
       compare,
       get_info,
       section == SECTION_CC_BILLING
           ? full_wallet->billing_address()->language_code()
           : full_wallet->shipping_address()->language_code(),
       g_browser_process->GetApplicationLocale());
 }
 
 void FillOutputForSection(
     DialogSection section,
     FormStructure& form_structure,
     FullWallet* full_wallet,
     const base::string16& email_address) {
   DCHECK(section == SECTION_CC_BILLING || section == SECTION_SHIPPING);
   DetailInputs inputs;
   if (section == SECTION_CC_BILLING)
     BuildCcBillingInputs(&inputs);
   else
     BuildShippingInputs(&inputs);
 
   FillOutputForSectionWithComparator(
-      section, inputs,
-      base::Bind(common::ServerTypeMatchesField, section),
+      section, inputs, base::Bind(ServerTypeMatchesField, section),
       form_structure, full_wallet, email_address);
 
   if (section == SECTION_CC_BILLING) {
     // Email is hidden while using Wallet, special case it.
     for (size_t i = 0; i < form_structure.field_count(); ++i) {
       AutofillField* field = form_structure.field(i);
       if (field->Type().GetStorableType() == EMAIL_ADDRESS)
         field->value = email_address;
     }
   }
 }
 
 // Returns true if |input_type| in |section| is needed for |form_structure|.
 bool IsSectionInputUsedInFormStructure(DialogSection section,
                                        ServerFieldType input_type,
                                        const FormStructure& form_structure) {
   for (size_t i = 0; i < form_structure.field_count(); ++i) {
     const AutofillField* field = form_structure.field(i);
-    if (field && common::ServerTypeMatchesField(section, input_type, *field))
+    if (field && ServerTypeMatchesField(section, input_type, *field))
       return true;
   }
   return false;
 }
 
 // Returns true if one of |inputs| in |section| is needed for |form_structure|.
 bool IsSectionInputsUsedInFormStructure(DialogSection section,
                                         const ServerFieldType* input_types,
                                         const size_t input_types_size,
                                         const FormStructure& form_structure) {
@@ skipping 167 matching lines @@
           SECTION_SHIPPING,
           shipping_phone_number_is_necessary_if,
           arraysize(shipping_phone_number_is_necessary_if),
           form_structure_);
 
   bool request_shipping_address = false;
   {
     DetailInputs inputs;
     BuildShippingInputs(&inputs);
     request_shipping_address = form_structure_.FillFields(
-        common::TypesFromInputs(inputs),
-        base::Bind(common::ServerTypeMatchesField, SECTION_SHIPPING),
-        base::Bind(NullGetInfo),
-        std::string(),
+        TypesFromInputs(inputs),
+        base::Bind(ServerTypeMatchesField, SECTION_SHIPPING),
+        base::Bind(NullGetInfo), std::string(),
         g_browser_process->GetApplicationLocale());
   }
 
   bool last_used_choice_is_autofill = false;
   base::string16 last_used_account_name;
   std::string last_used_billing;
   std::string last_used_shipping;
   std::string last_used_credit_card;
   {
     const base::DictionaryValue* defaults =
@@ skipping 168 matching lines @@
 
 void AutofillDialogControllerAndroid::LogOnCancelMetrics() {
   AutofillMetrics::LogDialogUiDuration(
       base::Time::Now() - dialog_shown_timestamp_,
       AutofillMetrics::DIALOG_CANCELED);
 
   AutofillMetrics::LogDialogUiEvent(AutofillMetrics::DIALOG_UI_CANCELED);
 }
 
 }  // namespace autofill