rAc - hardcode wallet billing address to US in i18n mode

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 18 matching lines @@
 namespace autofill {
 
 using base::ASCIIToUTF16;
 using base::UTF16ToUTF8;
 
 DataModelWrapper::~DataModelWrapper() {}
 
 void DataModelWrapper::FillInputs(DetailInputs* inputs) {
   for (size_t i = 0; i < inputs->size(); ++i) {
     DetailInput* input = &(*inputs)[i];
-    input->initial_value = common::GetHardcodedValueForType(input->type);
+    if (!i18ninput::Enabled())
+      input->initial_value = common::GetHardcodedValueForType(input->type);
     if (input->initial_value.empty())
       input->initial_value = GetInfo(AutofillType(input->type));
   }
 }
 
 base::string16 DataModelWrapper::GetInfoForDisplay(const AutofillType& type)
     const {
   return GetInfo(type);
 }
 
@@ skipping 288 matching lines @@
 
 FullWalletShippingWrapper::~FullWalletShippingWrapper() {}
 
 base::string16 FullWalletShippingWrapper::GetInfo(
     const AutofillType& type) const {
   return full_wallet_->shipping_address()->GetInfo(
       type, g_browser_process->GetApplicationLocale());
 }
 
 }  // namespace autofill