Don't save duplicates of wallet addresses to local Autofill.

components/autofill/core/browser/webdata/autofill_table.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/webdata/autofill_table.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <map>
@@ skipping 877 matching lines @@
     std::string guid = s.ColumnString(0);
     AutofillProfile* profile = NULL;
     if (!GetAutofillProfile(guid, &profile))
       return false;
     profiles->push_back(profile);
   }
 
   return s.Succeeded();
 }
 
-bool AutofillTable::GetAutofillServerProfiles(
-    std::vector<AutofillProfile*>* profiles) {
+bool AutofillTable::GetServerProfiles(std::vector<AutofillProfile*>* profiles) {
   profiles->clear();
 
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT "
         "id,"
         "recipient_name,"
         "company_name,"
         "street_address,"
         "address_1,"  // ADDRESS_HOME_STATE
         "address_2,"  // ADDRESS_HOME_CITY
         "address_3,"  // ADDRESS_HOME_DEPENDENT_LOCALITY
         "address_4,"  // Not supported in AutofillProfile yet.
         "postal_code,"  // ADDRESS_HOME_ZIP
         "sorting_code,"  // ADDRESS_HOME_SORTING_CODE
         "country_code,"  // ADDRESS_HOME_COUNTRY
         "language_code "
       "FROM server_addresses"));
 
   while (s.Step()) {
     int index = 0;
     scoped_ptr<AutofillProfile> profile(new AutofillProfile(
         AutofillProfile::SERVER_PROFILE, s.ColumnString(index++)));
 
-    profile->SetRawInfo(NAME_FULL, s.ColumnString16(index++));
+    base::string16 recipient_name = s.ColumnString16(index++);
     profile->SetRawInfo(COMPANY_NAME, s.ColumnString16(index++));
     profile->SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, s.ColumnString16(index++));
     profile->SetRawInfo(ADDRESS_HOME_STATE, s.ColumnString16(index++));
     profile->SetRawInfo(ADDRESS_HOME_CITY, s.ColumnString16(index++));
     profile->SetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY,
                         s.ColumnString16(index++));
     index++;  // Skip address_4 which we haven't added to AutofillProfile yet.
     profile->SetRawInfo(ADDRESS_HOME_ZIP, s.ColumnString16(index++));
     profile->SetRawInfo(ADDRESS_HOME_SORTING_CODE, s.ColumnString16(index++));
     profile->SetRawInfo(ADDRESS_HOME_COUNTRY, s.ColumnString16(index++));
     profile->set_language_code(s.ColumnString(index++));
 
+    // SetInfo instead of SetRawInfo on the name so the constituent pieces will
+    // be parsed.
+    profile->SetInfo(AutofillType(NAME_FULL), recipient_name,
+                     profile->language_code());
+
     profiles->push_back(profile.release());
   }
 
   return s.Succeeded();
 }
 
-void AutofillTable::SetAutofillServerProfiles(
+void AutofillTable::SetServerProfiles(
     const std::vector<AutofillProfile>& profiles) {
   // Delete all old ones first.
   sql::Statement delete_old(db_->GetUniqueStatement(
       "DELETE FROM server_addresses"));
   delete_old.Run();
 
   sql::Statement insert(db_->GetUniqueStatement(
       "INSERT INTO server_addresses("
         "id,"
         "recipient_name,"
@@ skipping 1026 matching lines @@
 bool AutofillTable::MigrateToVersion63AddServerRecipientName() {
   if (!db_->DoesColumnExist("server_addresses", "recipient_name") &&
       !db_->Execute("ALTER TABLE server_addresses ADD COLUMN "
                     "recipient_name VARCHAR")) {
     return false;
   }
   return true;
 }
 
 }  // namespace autofill