Remove DataModelWrapper from android build.

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

Index: components/autofill/content/browser/wallet/full_wallet.h
diff --git a/components/autofill/content/browser/wallet/full_wallet.h b/components/autofill/content/browser/wallet/full_wallet.h
index e3d185d9f6fb96e7f0cfa427535386272df5e8b9..be995f5d918326b810694b78cc2e74bb8d33f54e 100644
--- a/components/autofill/content/browser/wallet/full_wallet.h
+++ b/components/autofill/content/browser/wallet/full_wallet.h
@@ -52,7 +52,10 @@ class FullWallet {
                                     scoped_ptr<Address> shipping_address);
 
   // Returns corresponding data for |type|.
-  base::string16 GetInfo(const AutofillType& type);
+  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;
@@ -61,6 +64,10 @@ class FullWallet {
   // 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;
 
@@ -103,10 +110,6 @@ class FullWallet {
   // 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();

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

^ why is revealing this method preferable?

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

Why not expose it? It makes the code slightly shorter/easier to read.

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

2 ways of doing the same thing.

[Evan Stade, 2014/01/27 20:28:24]

which each have their own purpose. One is easier to use when you know that you
want a pan. The other is easier to use when you have some generic type (which
may be a pan) that you need.

-
   // Decrypts and returns the card verification number (CVN) using the generated
   // one time pad, |one_time_pad_|.
   const std::string& GetCvn();