Autofill database migration to clean up bogus profiles.

chrome/browser/autofill/autofill_profile.cc

 // Copyright (c) 2011 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/autofill/autofill_profile.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/stl_util-inl.h"
@@ skipping 293 matching lines @@
   return guid_ == profile.guid_ && Compare(profile) == 0;
 }
 
 bool AutofillProfile::operator!=(const AutofillProfile& profile) const {
   return !operator==(profile);
 }
 
 const string16 AutofillProfile::PrimaryValue() const {
   return GetFieldText(AutofillType(NAME_FULL)) +
          GetFieldText(AutofillType(ADDRESS_HOME_LINE1)) +
-         GetFieldText(AutofillType(ADDRESS_HOME_LINE2)) +
-         GetFieldText(AutofillType(EMAIL_ADDRESS));

[Ilya Sherman, 2011/03/16 23:07:16]

This isn't the right fix for not merging with empty emails.  For one, the same
problem exists with empty names.  Moreover, we added the email address to the
"primary value" because we got a lot of pushback when we started automatically
merging email addresses --
http://code.google.com/p/chromium/issues/detail?id=64669

I think it would be better to address this in a separate cl, for clarity's sake.
 However, if we want to cover this case in the migration that *this* CL
implements, then we should make sure to commit the other CL first.  I think it's
actually ok to just not worry about it for now -- we're going to do another
migration later, so it should be fine to handle edge cases like this one at that
time.

[dhollowa, 2011/03/17 00:02:42]

Yes, true.  Will address later.

On 2011/03/16 23:07:16, Ilya Sherman wrote:

+         GetFieldText(AutofillType(ADDRESS_HOME_LINE2));
 }
 
 string16 AutofillProfile::ConstructInferredLabel(
     const std::vector<AutofillFieldType>& included_fields,
     size_t num_fields_to_use) const {
   const string16 separator =
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADDRESS_SUMMARY_SEPARATOR);
 
   string16 label;
   size_t num_fields_used = 0;
@@ skipping 156 matching lines @@
       << UTF16ToUTF8(profile.GetFieldText(AutofillType(ADDRESS_HOME_ZIP)))
       << " "
       << UTF16ToUTF8(profile.GetFieldText(AutofillType(ADDRESS_HOME_COUNTRY)))
       << " "
       << UTF16ToUTF8(profile.GetFieldText(AutofillType(
              PHONE_HOME_WHOLE_NUMBER)))
       << " "
       << UTF16ToUTF8(profile.GetFieldText(AutofillType(
              PHONE_FAX_WHOLE_NUMBER)));
 }