autocomplete: add ability to get full address (hidden behind a flag).

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"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_i18n_input.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "components/autofill/content/browser/wallet/full_wallet.h"
 #include "components/autofill/content/browser/wallet/wallet_address.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
+#include "components/autofill/core/browser/address_i18n.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_data_model.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
 #include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 21 matching lines @@
 
 bool DataModelWrapper::GetDisplayText(
     base::string16* vertically_compact,
     base::string16* horizontally_compact) {
   base::string16 phone =
       GetInfoForDisplay(AutofillType(PHONE_HOME_WHOLE_NUMBER));
   if (phone.empty())
     return false;
 
   // Format the address.
-  ::i18n::addressinput::AddressData address_data;
-  i18ninput::CreateAddressData(
-      base::Bind(&DataModelWrapper::GetInfo, base::Unretained(this)),
-      &address_data);
-  address_data.language_code = GetLanguageCode();
+  scoped_ptr<::i18n::addressinput::AddressData> address_data =
+      i18n::CreateAddressData(
+          base::Bind(&DataModelWrapper::GetInfo, base::Unretained(this)));
+  address_data->language_code = GetLanguageCode();
   std::vector<std::string> lines;
-  address_data.FormatForDisplay(&lines);
+  address_data->FormatForDisplay(&lines);
 
   // Email and phone number aren't part of address formatting.
   base::string16 non_address_info;
   base::string16 email = GetInfoForDisplay(AutofillType(EMAIL_ADDRESS));
   if (!email.empty())
     non_address_info += base::ASCIIToUTF16("\n") + email;
 
   non_address_info += base::ASCIIToUTF16("\n") + phone;
 
   // The separator is locale-specific.
@@ skipping 321 matching lines @@
   }
 
   return base::UTF8ToUTF16(address_->GetFieldValue(field));
 }
 
 const std::string& I18nAddressDataWrapper::GetLanguageCode() const {
   return address_->language_code;
 }
 
 }  // namespace autofill