Remove DataModelWrapper from android build.

components/autofill/content/browser/wallet/full_wallet_unittest.cc

Index: components/autofill/content/browser/wallet/full_wallet_unittest.cc
diff --git a/components/autofill/content/browser/wallet/full_wallet_unittest.cc b/components/autofill/content/browser/wallet/full_wallet_unittest.cc
index 3d156a84276000a26a00a3494869816df1b1753a..4ba10477f40ae9c354e86b3fdfffdd23da9b4d3b 100644
--- a/components/autofill/content/browser/wallet/full_wallet_unittest.cc
+++ b/components/autofill/content/browser/wallet/full_wallet_unittest.cc
@@ -456,9 +456,10 @@ TEST_F(FullWalletTest, RestLengthCorrectDecryptionTest) {
   EXPECT_TRUE(base::HexStringToBytes("5F04A8704183", &one_time_pad));
   full_wallet.set_one_time_pad(one_time_pad);
   EXPECT_EQ(ASCIIToUTF16("5285121925598459"),
-            full_wallet.GetInfo(AutofillType(CREDIT_CARD_NUMBER)));
+            full_wallet.GetBillingInfo("", AutofillType(CREDIT_CARD_NUMBER)));
   EXPECT_EQ(ASCIIToUTF16("989"),
-            full_wallet.GetInfo(AutofillType(CREDIT_CARD_VERIFICATION_CODE)));
+            full_wallet.GetBillingInfo("",
+                AutofillType(CREDIT_CARD_VERIFICATION_CODE)));
 }
 
 TEST_F(FullWalletTest, RestLengthUnderDecryptionTest) {
@@ -474,9 +475,10 @@ TEST_F(FullWalletTest, RestLengthUnderDecryptionTest) {
   EXPECT_TRUE(base::HexStringToBytes("063AD35324BF", &one_time_pad));
   full_wallet.set_one_time_pad(one_time_pad);
   EXPECT_EQ(ASCIIToUTF16("5285127106109719"),
-            full_wallet.GetInfo(AutofillType(CREDIT_CARD_NUMBER)));
+            full_wallet.GetBillingInfo("", AutofillType(CREDIT_CARD_NUMBER)));
   EXPECT_EQ(ASCIIToUTF16("385"),
-            full_wallet.GetInfo(AutofillType(CREDIT_CARD_VERIFICATION_CODE)));
+            full_wallet.GetBillingInfo("",
+                AutofillType(CREDIT_CARD_VERIFICATION_CODE)));
 }
 
 TEST_F(FullWalletTest, GetCreditCardInfo) {
@@ -490,21 +492,22 @@ TEST_F(FullWalletTest, GetCreditCardInfo) {
                          required_actions);
 
   EXPECT_EQ(ASCIIToUTF16("15"),
-            full_wallet.GetInfo(AutofillType(CREDIT_CARD_EXP_2_DIGIT_YEAR)));
+            full_wallet.GetBillingInfo("",
+                AutofillType(CREDIT_CARD_EXP_2_DIGIT_YEAR)));
 
   EXPECT_EQ(ASCIIToUTF16("12/15"),
-            full_wallet.GetInfo(
+            full_wallet.GetBillingInfo("",
                 AutofillType(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR)));
 
   EXPECT_EQ(ASCIIToUTF16("12/2015"),
-            full_wallet.GetInfo(
+            full_wallet.GetBillingInfo("",
                 AutofillType(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR)));
 
   std::vector<uint8> one_time_pad;
   EXPECT_TRUE(base::HexStringToBytes("075DA779F98B", &one_time_pad));
   full_wallet.set_one_time_pad(one_time_pad);
   EXPECT_EQ(ASCIIToUTF16("MasterCard"),
-            full_wallet.GetInfo(AutofillType(CREDIT_CARD_TYPE)));
+            full_wallet.GetBillingInfo("", AutofillType(CREDIT_CARD_TYPE)));
 }
 
 TEST_F(FullWalletTest, CreateFullWalletFromClearTextData) {
@@ -514,13 +517,14 @@ TEST_F(FullWalletTest, CreateFullWalletFromClearTextData) {
           "5555555555554444", "123",
           GetTestAddress(), GetTestShippingAddress());
   EXPECT_EQ(ASCIIToUTF16("5555555555554444"),
-            full_wallet->GetInfo(AutofillType(CREDIT_CARD_NUMBER)));
+            full_wallet->GetBillingInfo("", AutofillType(CREDIT_CARD_NUMBER)));
   EXPECT_EQ(ASCIIToUTF16("MasterCard"),
-            full_wallet->GetInfo(AutofillType(CREDIT_CARD_TYPE)));
+            full_wallet->GetBillingInfo("", AutofillType(CREDIT_CARD_TYPE)));
   EXPECT_EQ(ASCIIToUTF16("123"),
-            full_wallet->GetInfo(AutofillType(CREDIT_CARD_VERIFICATION_CODE)));
+            full_wallet->GetBillingInfo("",
+                AutofillType(CREDIT_CARD_VERIFICATION_CODE)));
   EXPECT_EQ(ASCIIToUTF16("11/12"),
-            full_wallet->GetInfo(
+            full_wallet->GetBillingInfo("",

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

^ i don't see the changes of this file as a win

[Evan Stade, 2014/01/27 22:36:50]

I don't write code with the intent of making unit tests beautiful

                 AutofillType(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR)));
   EXPECT_TRUE(GetTestAddress()->EqualsIgnoreID(
       *full_wallet->billing_address()));