Merge 53276 - AutoFill Empty profiles should not be saved from AutoFillDialog...

chrome/browser/autofill/autofill_profile.cc

 // Copyright (c) 2010 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 <list>
 #include <map>
 #include <set>
@@ skipping 187 matching lines @@
   // E.g. "John Smith, 123 Main Street".
   string16 summary_format = l10n_util::GetStringFUTF16(
       IDS_AUTOFILL_DIALOG_ADDRESS_SUMMARY_FORMAT,
       name_format,
       summary_separator,
       address);
 
   return summary_format;
 }
 
+// static
 bool AutoFillProfile::AdjustInferredLabels(
     std::vector<AutoFillProfile*>* profiles) {
   std::vector<string16> created_labels;
   const size_t kMinimalFieldsShown = 2;
   CreateInferredLabels(profiles, &created_labels, kMinimalFieldsShown,
                        UNKNOWN_TYPE);
   DCHECK(profiles->size() == created_labels.size());
   bool updated_labels = false;
   for (size_t i = 0; i < profiles->size(); ++i) {
     if (profiles->at(i)->Label() != created_labels[i]) {
       updated_labels = true;
       profiles->at(i)->set_label(created_labels[i]);
     }
   }
   return updated_labels;
 }
 
+// static
 void AutoFillProfile::CreateInferredLabels(
     const std::vector<AutoFillProfile*>* profiles,
     std::vector<string16>* created_labels,
     size_t minimal_fields_shown,
     AutoFillFieldType exclude_field) {
   // These fields are use to distinguish between two profiles in the order of
   // importance, e. g. if both EMAIL_ADDRESS and COMPANY_NAME are different,
   // EMAIL_ADDRESS will be used to distinguish them.
   const AutoFillFieldType distinguishing_fields[] = {
     // First non empty data are always present in the label, even if it matches.
@@ skipping 133 matching lines @@
         }
       }
 
       (*created_labels)[label_iterator->second.front()] =
           profiles->at(label_iterator->second.front())->ConstructInferredLabel(
               &non_empty_fields);
     }
   }
 }
 
+bool AutoFillProfile::IsEmpty() const {
+  FieldTypeSet types;
+  GetAvailableFieldTypes(&types);
+  return types.empty();
+}
+
 void AutoFillProfile::operator=(const AutoFillProfile& source) {
   label_ = source.label_;
   unique_id_ = source.unique_id_;
 
   STLDeleteContainerPairSecondPointers(personal_info_.begin(),
                                        personal_info_.end());
   personal_info_.clear();
 
   FormGroupMap::const_iterator iter;
   for (iter = source.personal_info_.begin();
@@ skipping 95 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)));
 }