Remove DataModelWrapper from android build.

components/autofill/content/browser/wallet/full_wallet.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/content/browser/wallet/full_wallet.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 136 matching lines @@
       std::string(),  // no iin -- clear text pan/cvn are set below.
       std::string(),  // no encrypted_rest -- clear text pan/cvn are set below.
       billing_address.Pass(),
       shipping_address.Pass(),
       std::vector<RequiredAction>()));  // no required actions in clear text.
   wallet->pan_ = pan;
   wallet->cvn_ = cvn;
   return wallet.Pass();
 }
 
-base::string16 FullWallet::GetInfo(const AutofillType& type) {
+base::string16 FullWallet::GetBillingInfo(const std::string& app_locale,
+                                          const AutofillType& type) {

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

nit: reverse the order of |app_locale| and |type| as we do |type|, |app_locale|
everywhere else

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

can't, this is needed for the bind() to work

   switch (type.GetStorableType()) {
     case CREDIT_CARD_NUMBER:
       return base::UTF8ToUTF16(GetPan());

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

nit: base::ASCIIToUTF16() if you assume CVN/PAN can't be non-ASCII or maybe just
put a NOTREACHED()

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

Done.

 
     case CREDIT_CARD_NAME:
       return billing_address()->recipient_name();
 
     case CREDIT_CARD_VERIFICATION_CODE:
       return base::UTF8ToUTF16(GetCvn());

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

same nit: re base::ASCIIToUTF16()

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

Done.

 
     case CREDIT_CARD_EXP_MONTH:
       if (expiration_month() == 0)
         return base::string16();
       return base::IntToString16(expiration_month());
 
     case CREDIT_CARD_EXP_4_DIGIT_YEAR:
       if (expiration_year() == 0)
         return base::string16();
       return base::IntToString16(expiration_year());
@@ skipping 17 matching lines @@
 
     case CREDIT_CARD_TYPE: {
       std::string internal_type =
           CreditCard::GetCreditCardType(base::UTF8ToUTF16(GetPan()));
       if (internal_type == kGenericCard)
         return base::string16();
       return CreditCard::TypeForDisplay(internal_type);
     }
 
     default:
-      NOTREACHED();
+      DCHECK_NE(CREDIT_CARD, type.group());
+      return billing_address_->GetInfo(type, app_locale);
   }
+}
 
-  return base::string16();
+base::string16 FullWallet::GetShippingInfo(const std::string& app_locale,
+                                           const AutofillType& type) {
+  return shipping_address_->GetInfo(type, app_locale);
 }
 
 bool FullWallet::HasRequiredAction(RequiredAction action) const {
   DCHECK(ActionAppliesToFullWallet(action));
   return std::find(required_actions_.begin(),
                    required_actions_.end(),
                    action) != required_actions_.end();
 }
 
 base::string16 FullWallet::TypeAndLastFourDigits() {
   CreditCard card;
-  card.SetRawInfo(CREDIT_CARD_NUMBER,
-                  GetInfo(AutofillType(CREDIT_CARD_NUMBER)));
+  card.SetRawInfo(CREDIT_CARD_NUMBER, base::ASCIIToUTF16(GetPan()));
   return card.TypeAndLastFourDigits();
 }
 
+const std::string& FullWallet::GetPan() {
+  if (pan_.empty())
+    DecryptCardInfo();
+  return pan_;
+}
+
 bool FullWallet::operator==(const FullWallet& other) const {
   if (expiration_month_ != other.expiration_month_)
     return false;
 
   if (expiration_year_ != other.expiration_year_)
     return false;
 
   if (iin_ != other.iin_)
     return false;
 
@@ skipping 66 matching lines @@
   // to be padded with 0's until it is.
   if (card_info.size() != padded_length)
     card_info.insert(card_info.begin(), padded_length - card_info.size(), '0');
 
   // Separate out the PAN from the CVN.
   size_t split = kPanSize - kBinSize;
   cvn_ = card_info.substr(split);
   pan_ = iin_ + card_info.substr(0, split);
 }
 
-const std::string& FullWallet::GetPan() {
-  if (pan_.empty())
-    DecryptCardInfo();
-  return pan_;
-}
-
 const std::string& FullWallet::GetCvn() {
   if (cvn_.empty())
     DecryptCardInfo();
   return cvn_;
 }
 
 }  // namespace wallet
 }  // namespace autofill