Remove DataModelWrapper from android build.

components/autofill/content/browser/wallet/full_wallet.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_FULL_WALLET_H_
 #define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_FULL_WALLET_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 34 matching lines @@
   // Data is not validated; |pan|, |cvn| and |billing_address| must be set.
   static scoped_ptr<FullWallet>
       CreateFullWalletFromClearText(int expiration_month,
                                     int expiration_year,
                                     const std::string& pan,
                                     const std::string& cvn,
                                     scoped_ptr<Address> billing_address,
                                     scoped_ptr<Address> shipping_address);
 
   // Returns corresponding data for |type|.
-  base::string16 GetInfo(const AutofillType& type);

[Dan Beam, 2014/01/27 20:51:40]

i think |type| was sufficient to determine whether billing or shipping
information was necessary

+  base::string16 GetBillingInfo(const std::string& app_locale,
+                                const AutofillType& type);
+  base::string16 GetShippingInfo(const std::string& app_locale,
+                                 const AutofillType& type);
 
   // Whether or not |action| is in |required_actions_|.
   bool HasRequiredAction(RequiredAction action) const;
 
   // The type of the card that this FullWallet contains and the last four digits
   // like this "Visa - 4111".
   base::string16 TypeAndLastFourDigits();
 
+  // Decrypts and returns the primary account number (PAN) using the generated
+  // one time pad, |one_time_pad_|.
+  const std::string& GetPan();
+
   bool operator==(const FullWallet& other) const;
   bool operator!=(const FullWallet& other) const;
 
   // If there are required actions |billing_address_| might contain NULL.
   const Address* billing_address() const { return billing_address_.get(); }
 
   // If there are required actions or shipping address is not required
   // |shipping_address_| might contain NULL.
   const Address* shipping_address() const { return shipping_address_.get(); }
 
@@ skipping 22 matching lines @@
              int expiration_year,
              const std::string& iin,
              const std::string& encrypted_rest,
              scoped_ptr<Address> billing_address,
              scoped_ptr<Address> shipping_address,
              const std::vector<RequiredAction>& required_actions);
 
   // Decrypts both |pan_| and |cvn_|.
   void DecryptCardInfo();
 
-  // Decrypts and returns the primary account number (PAN) using the generated
-  // one time pad, |one_time_pad_|.
-  const std::string& GetPan();
-
   // Decrypts and returns the card verification number (CVN) using the generated
   // one time pad, |one_time_pad_|.
   const std::string& GetCvn();
 
   // The expiration month of the proxy card. It should be 1-12.
   int expiration_month_;
 
   // The expiration year of the proxy card. It should be a 4-digit year.
   int expiration_year_;
 
@@ skipping 22 matching lines @@
   // The one time pad used for FullWallet encryption.
   std::vector<uint8> one_time_pad_;
 
   DISALLOW_COPY_AND_ASSIGN(FullWallet);
 };
 
 }  // namespace wallet
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_FULL_WALLET_H_