Fill in country code correctly for wallet billing addresses.

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"
@@ skipping 310 matching lines @@
 FullWalletBillingWrapper::FullWalletBillingWrapper(
     wallet::FullWallet* full_wallet)
     : full_wallet_(full_wallet) {
   DCHECK(full_wallet_);
 }
 
 FullWalletBillingWrapper::~FullWalletBillingWrapper() {}
 
 base::string16 FullWalletBillingWrapper::GetInfo(const AutofillType& type)
     const {
-  return full_wallet_->GetInfo(
-      g_browser_process->GetApplicationLocale(),
-      AutofillType(AutofillType::GetEquivalentBillingFieldType(
-          type.GetStorableType())));
+  return full_wallet_->GetInfo(g_browser_process->GetApplicationLocale(), type);
 }
 
 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,
@@ skipping 51 matching lines @@
   }
 
   return base::UTF8ToUTF16(address_->GetFieldValue(field));
 }
 
 const std::string& I18nAddressDataWrapper::GetLanguageCode() const {
   return address_->language_code;
 }
 
 }  // namespace autofill