Use upstream libaddressinput in Chrome.

chrome/browser/ui/autofill/data_model_wrapper_unittest.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 "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
@@ skipping 81 matching lines @@
             address_wrapper.GetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER)));
   EXPECT_FALSE(address_wrapper.GetDisplayText(&unused, &unused2));
 }
 
 TEST(DataModelWrapperTest, GetDisplayText) {
   AutofillProfile profile = test::GetFullProfile();
   base::string16 vertical, horizontal;
   EXPECT_TRUE(
       AutofillProfileWrapper(&profile).GetDisplayText(&horizontal, &vertical));
   EXPECT_EQ(
-      ASCIIToUTF16("John H. Doe, 666 Erebus St., Apt 8, Elysium, CA 91111\n"
+      ASCIIToUTF16("John H. Doe, 666 Erebus St., Apt 8, Elysium CA 91111\n"
                    "johndoe@hades.com\n"
                    "+1 650-211-1111"),
       horizontal);
   EXPECT_EQ(
       ASCIIToUTF16("John H. Doe\n"
                    "666 Erebus St.\n"
                    "Apt 8\n"
-                   "Elysium, CA 91111\n"
+                   "Elysium CA 91111\n"
                    "johndoe@hades.com\n"
                    "+1 650-211-1111"),
       vertical);
 
   // A Japanese address.
   AutofillProfile foreign_profile(
       base::GenerateGUID(), "http://www.example.com/");
   foreign_profile.SetRawInfo(
       ADDRESS_HOME_COUNTRY, ASCIIToUTF16("JP"));
   foreign_profile.SetRawInfo(
@@ skipping 105 matching lines @@
             profile_wrapper.GetInfoForDisplay(
                 AutofillType(PHONE_HOME_WHOLE_NUMBER)));
   profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, user_formatted);
   EXPECT_EQ(user_formatted,
             profile_wrapper.GetInfoForDisplay(
                 AutofillType(PHONE_HOME_WHOLE_NUMBER)));
 
 }
 
 }  // namespace autofill