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

components/autofill/core/browser/autofill_profile.cc

 // Copyright 2013 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 "components/autofill/core/browser/autofill_profile.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <ostream>
 #include <set>
 
 #include "base/basictypes.h"
+#include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/address.h"
+#include "components/autofill/core/browser/address_i18n.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/contact_info.h"
 #include "components/autofill/core/browser/phone_number.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "grit/component_strings.h"
+#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
 #include "ui/base/l10n/l10n_util.h"
 
+

[Ilya Sherman, 2014/05/07 01:19:19]

nit: Spurious newline.

[Evan Stade, 2014/05/09 22:14:59]

Done.

 using base::ASCIIToUTF16;
 using base::UTF16ToUTF8;
 
 namespace autofill {
 namespace {
 
 // Like |AutofillType::GetStorableType()|, but also returns |NAME_FULL| for
 // first, middle, and last name field types.
 ServerFieldType GetStorableTypeCollapsingNames(ServerFieldType type) {
   ServerFieldType storable_type = AutofillType(type).GetStorableType();
@@ skipping 174 matching lines @@
 // Functor used to check for case-insensitive equality of two strings.
 struct CaseInsensitiveStringEquals
     : public std::binary_function<base::string16, base::string16, bool>
 {
   bool operator()(const base::string16& x, const base::string16& y) const {
     return
         x.size() == y.size() && StringToLowerASCII(x) == StringToLowerASCII(y);
   }
 };
 
+base::string16 GetInfoHelper(const AutofillProfile* profile,

[Ilya Sherman, 2014/05/07 01:19:19]

nit: Why not const-ref?

[Evan Stade, 2014/05/09 22:14:59]

Done.

+                             const std::string& app_locale,
+                             const AutofillType& type) {
+  return profile->GetInfo(type, app_locale);
+}
+
 }  // namespace
 
 AutofillProfile::AutofillProfile(const std::string& guid,
                                  const std::string& origin)
     : AutofillDataModel(guid, origin),
       name_(1),
       email_(1),
       phone_number_(1, PhoneNumber(this)) {
 }
 
@@ skipping 52 matching lines @@
 
 void AutofillProfile::SetRawInfo(ServerFieldType type,
                                  const base::string16& value) {
   FormGroup* form_group = MutableFormGroupForType(AutofillType(type));
   if (form_group)
     form_group->SetRawInfo(type, value);
 }
 
 base::string16 AutofillProfile::GetInfo(const AutofillType& type,
                                         const std::string& app_locale) const {
+  if (type.html_type() == HTML_TYPE_FULL_ADDRESS) {
+    scoped_ptr<::i18n::addressinput::AddressData> address_data =
+        i18n::CreateAddressData(base::Bind(&GetInfoHelper, this, app_locale));
+    address_data->language_code = language_code();
+    std::vector<std::string> lines;
+    address_data->FormatForDisplay(&lines);
+    return base::UTF8ToUTF16(JoinString(lines, '\n'));
+  }
+
   const FormGroup* form_group = FormGroupForType(type);
   if (!form_group)
     return base::string16();
 
   return form_group->GetInfo(type, app_locale);
 }
 
 bool AutofillProfile::SetInfo(const AutofillType& type,
                               const base::string16& value,
                               const std::string& app_locale) {
@@ skipping 549 matching lines @@
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY))
       << " "
       << profile.language_code()
       << " "
       << UTF16ToUTF8(MultiString(profile, PHONE_HOME_WHOLE_NUMBER));
 }
 
 }  // namespace autofill