Remove DataModelWrapper from android build.

chrome/browser/ui/autofill/data_model_wrapper.cc

 // Copyright (c) 2012 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/data_model_wrapper.h"
 
+#include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_common.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "components/autofill/content/browser/wallet/full_wallet.h"
 #include "components/autofill/content/browser/wallet/wallet_address.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
 #include "components/autofill/core/browser/autofill_data_model.h"
 #include "components/autofill/core/browser/autofill_field.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/form_structure.h"
+#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
+#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
-#if !defined(OS_ANDROID)
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui.h"
-#endif
-
 namespace autofill {
 
 using base::ASCIIToUTF16;
 using base::UTF16ToUTF8;
 
 DataModelWrapper::~DataModelWrapper() {}
 
 void DataModelWrapper::FillInputs(DetailInputs* inputs) {
   for (size_t i = 0; i < inputs->size(); ++i) {
     DetailInput* input = &(*inputs)[i];
     input->initial_value = common::GetHardcodedValueForType(input->type);
     if (input->initial_value.empty())
       input->initial_value = GetInfo(AutofillType(input->type));
   }
 }
 
 base::string16 DataModelWrapper::GetInfoForDisplay(const AutofillType& type)
     const {
   return GetInfo(type);
 }
 
 gfx::Image DataModelWrapper::GetIcon() {
   return gfx::Image();
 }
 
-#if !defined(OS_ANDROID)
 bool DataModelWrapper::GetDisplayText(
     base::string16* vertically_compact,
     base::string16* horizontally_compact) {
   // Format the address.
   ::i18n::addressinput::AddressData address_data;
   address_data.recipient = UTF16ToUTF8(
       GetInfoForDisplay(AutofillType(NAME_FULL)));
   address_data.country_code = UTF16ToUTF8(
       GetInfoForDisplay(AutofillType(ADDRESS_HOME_COUNTRY)));
   address_data.administrative_area = UTF16ToUTF8(
@@ skipping 31 matching lines @@
           g_browser_process->GetApplicationLocale(),
           address_data.country_code);
   *vertically_compact =
       base::UTF8ToUTF16(JoinString(lines, compact_separator)) +
           non_address_info;
   *horizontally_compact = base::UTF8ToUTF16(JoinString(lines, "\n")) +
       non_address_info;
 
   return true;
 }
-#endif
 
 bool DataModelWrapper::FillFormStructure(
-    const DetailInputs& inputs,
-    const InputFieldComparator& compare,
+    const std::vector<ServerFieldType>& types,
+    const FormStructure::InputFieldComparator& compare,
     FormStructure* form_structure) const {
-  bool filled_something = false;
-  for (size_t i = 0; i < form_structure->field_count(); ++i) {
-    AutofillField* field = form_structure->field(i);
-    for (size_t j = 0; j < inputs.size(); ++j) {
-      if (compare.Run(inputs[j].type, *field)) {
-        AutofillField::FillFormField(*field, GetInfo(field->Type()),
-                                     g_browser_process->GetApplicationLocale(),
-                                     field);
-        filled_something = true;
-        break;
-      }
-    }
-  }
-  return filled_something;
+  return form_structure->FillFields(
+      types,
+      compare,
+      base::Bind(&DataModelWrapper::GetInfo, base::Unretained(this)),
+      g_browser_process->GetApplicationLocale());
 }
 
 DataModelWrapper::DataModelWrapper() {}
 
-// EmptyDataModelWrapper
-
-EmptyDataModelWrapper::EmptyDataModelWrapper() {}
-EmptyDataModelWrapper::~EmptyDataModelWrapper() {}
-
-base::string16 EmptyDataModelWrapper::GetInfo(const AutofillType& type) const {
-  return base::string16();
-}
-
 // AutofillProfileWrapper
 
 AutofillProfileWrapper::AutofillProfileWrapper(const AutofillProfile* profile)
     : profile_(profile),
       variant_group_(NO_GROUP),
       variant_(0) {}
 
 AutofillProfileWrapper::AutofillProfileWrapper(
     const AutofillProfile* profile,
     const AutofillType& type,
@@ skipping 81 matching lines @@
     return MonthComboboxModel::FormatMonth(card_->expiration_month());
 
   return card_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
 gfx::Image AutofillCreditCardWrapper::GetIcon() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetImageNamed(CreditCard::IconResourceId(card_->type()));
 }
 
-#if !defined(OS_ANDROID)
 bool AutofillCreditCardWrapper::GetDisplayText(
     base::string16* vertically_compact,
     base::string16* horizontally_compact) {
   if (!card_->IsValid())
     return false;
 
   *vertically_compact = *horizontally_compact = card_->TypeAndLastFourDigits();
   return true;
 }
-#endif
 
 // WalletAddressWrapper
 
 WalletAddressWrapper::WalletAddressWrapper(
     const wallet::Address* address) : address_(address) {}
 
 WalletAddressWrapper::~WalletAddressWrapper() {}
 
 base::string16 WalletAddressWrapper::GetInfo(const AutofillType& type) const {
   // Reachable from DataModelWrapper::GetDisplayText().
   if (type.GetStorableType() == EMAIL_ADDRESS)
     return base::string16();
 
   return address_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
 base::string16 WalletAddressWrapper::GetInfoForDisplay(const AutofillType& type)
     const {
   if (type.GetStorableType() == PHONE_HOME_WHOLE_NUMBER)
     return address_->DisplayPhoneNumber();
 
   return DataModelWrapper::GetInfoForDisplay(type);
 }
 
-#if !defined(OS_ANDROID)
 bool WalletAddressWrapper::GetDisplayText(
     base::string16* vertically_compact,
     base::string16* horizontally_compact) {
   if (!address_->is_complete_address() ||
       GetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER)).empty()) {
     return false;
   }
 
   return DataModelWrapper::GetDisplayText(vertically_compact,
                                           horizontally_compact);
 }
-#endif
 
 // WalletInstrumentWrapper
 
 WalletInstrumentWrapper::WalletInstrumentWrapper(
     const wallet::WalletItems::MaskedInstrument* instrument)
     : instrument_(instrument) {}
 
 WalletInstrumentWrapper::~WalletInstrumentWrapper() {}
 
 base::string16 WalletInstrumentWrapper::GetInfo(const AutofillType& type)
@@ skipping 13 matching lines @@
   if (type.GetStorableType() == PHONE_HOME_WHOLE_NUMBER)
     return instrument_->address().DisplayPhoneNumber();
 
   return DataModelWrapper::GetInfoForDisplay(type);
 }
 
 gfx::Image WalletInstrumentWrapper::GetIcon() {
   return instrument_->CardIcon();
 }
 
-#if !defined(OS_ANDROID)
 bool WalletInstrumentWrapper::GetDisplayText(
     base::string16* vertically_compact,
     base::string16* horizontally_compact) {
   // TODO(dbeam): handle other instrument statuses? http://crbug.com/233048
   if (instrument_->status() == wallet::WalletItems::MaskedInstrument::EXPIRED ||
       !instrument_->address().is_complete_address() ||
       GetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER)).empty()) {
     return false;
   }
 
   DataModelWrapper::GetDisplayText(vertically_compact, horizontally_compact);
   // TODO(estade): descriptive_name() is user-provided. Should we use it or
   // just type + last 4 digits?
   base::string16 line1 = instrument_->descriptive_name() + ASCIIToUTF16("\n");
   *vertically_compact = line1 + *vertically_compact;
   *horizontally_compact = line1 + *horizontally_compact;
   return true;
 }
-#endif
 
 // FullWalletBillingWrapper
 
 FullWalletBillingWrapper::FullWalletBillingWrapper(
     wallet::FullWallet* full_wallet)
     : full_wallet_(full_wallet) {
   DCHECK(full_wallet_);
 }
 
 FullWalletBillingWrapper::~FullWalletBillingWrapper() {}
 
 base::string16 FullWalletBillingWrapper::GetInfo(const AutofillType& type)
     const {
-  if (type.GetStorableType() == CREDIT_CARD_EXP_MONTH)
-    return MonthComboboxModel::FormatMonth(full_wallet_->expiration_month());
-
-  if (type.group() == CREDIT_CARD)
-    return full_wallet_->GetInfo(type);
-
-  return full_wallet_->billing_address()->GetInfo(
-      type, g_browser_process->GetApplicationLocale());
+  return full_wallet_->GetBillingInfo(
+      g_browser_process->GetApplicationLocale(), type);

[Dan Beam, 2014/01/27 19:37:50]

i prefer the old API.

why have 2 different methods (Get{Billing,Shipping}Info) when you can just ask
for type.server_type()?

[Evan Stade, 2014/01/27 19:45:41]

because sometimes we're using the billing address to fill in the shipping info.

[Dan Beam, 2014/01/27 20:18:23]

GetEquivalentBillingFieldType()/AutofillType().GetStorableType()

 }
 
-#if !defined(OS_ANDROID)
 bool FullWalletBillingWrapper::GetDisplayText(
     base::string16* vertically_compact,
     base::string16* horizontally_compact) {
   // TODO(dbeam): handle other required actions? http://crbug.com/163508
   if (full_wallet_->HasRequiredAction(wallet::UPDATE_EXPIRATION_DATE))
     return false;
 
   return DataModelWrapper::GetDisplayText(vertically_compact,
                                           horizontally_compact);
 }
-#endif
 
 // FullWalletShippingWrapper
 
 FullWalletShippingWrapper::FullWalletShippingWrapper(
     wallet::FullWallet* full_wallet)
     : full_wallet_(full_wallet) {
   DCHECK(full_wallet_);
 }
 
 FullWalletShippingWrapper::~FullWalletShippingWrapper() {}
 
 base::string16 FullWalletShippingWrapper::GetInfo(
     const AutofillType& type) const {
-  return full_wallet_->shipping_address()->GetInfo(
-      type, g_browser_process->GetApplicationLocale());
+  return full_wallet_->GetShippingInfo(
+      g_browser_process->GetApplicationLocale(), type);
 }
 
 FieldMapWrapper::FieldMapWrapper(const FieldValueMap& field_map)
     : field_map_(field_map) {}
 
 FieldMapWrapper::~FieldMapWrapper() {}
 
 base::string16 FieldMapWrapper::GetInfo(const AutofillType& type) const {
   FieldValueMap::const_iterator it = field_map_.find(type.server_type());
   return it != field_map_.end() ? it->second : base::string16();
 }
 
 }  // namespace autofill