AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

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 <vector>
 
 #include "app/l10n_util.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/address.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/contact_info.h"
 #include "chrome/browser/autofill/fax_number.h"
 #include "chrome/browser/autofill/home_address.h"
@@ skipping 28 matching lines @@
 }
 
 AutoFillProfile::~AutoFillProfile() {
   STLDeleteContainerPairSecondPointers(personal_info_.begin(),
                                        personal_info_.end());
 }
 
 void AutoFillProfile::GetPossibleFieldTypes(
     const string16& text,
     FieldTypeSet* possible_types) const {
-  FormGroupMap::const_iterator iter;
-  for (iter = personal_info_.begin(); iter != personal_info_.end(); ++iter) {
+  for (FormGroupMap::const_iterator iter = personal_info_.begin();
+       iter != personal_info_.end(); ++iter) {
     FormGroup* data = iter->second;
     DCHECK(data != NULL);
-    if (data != NULL)
-      data->GetPossibleFieldTypes(text, possible_types);
+    data->GetPossibleFieldTypes(text, possible_types);
   }
 }
 
+void AutoFillProfile::GetAvailableFieldTypes(
+    FieldTypeSet* available_types) const {
+  for (FormGroupMap::const_iterator iter = personal_info_.begin();
+       iter != personal_info_.end(); ++iter) {
+    FormGroup* data = iter->second;
+    DCHECK(data != NULL);
+    data->GetAvailableFieldTypes(available_types);
+  }
+}
+
 string16 AutoFillProfile::GetFieldText(const AutoFillType& type) const {
   AutoFillType return_type = type;
 
   // When billing information is requested from the profile we map to the
   // home address equivalents.  This indicates the address information within
   // this profile is being used to fill billing fields in the form.
   switch (type.field_type()) {
     case ADDRESS_BILLING_LINE1:
       return_type = AutoFillType(ADDRESS_HOME_LINE1);
       break;
@@ skipping 67 matching lines @@
   FormGroupMap::const_iterator iter;
   for (iter = personal_info_.begin(); iter != personal_info_.end(); ++iter) {
     if (profile->personal_info_.count(iter->first))
       delete profile->personal_info_[iter->first];
     profile->personal_info_[iter->first] = iter->second->Clone();
   }
 
   return profile;
 }
 
+bool AutoFillProfile::IsSubsetOf(const AutoFillProfile& profile) const {
+  FieldTypeSet types;
+  GetAvailableFieldTypes(&types);
+
+  for (FieldTypeSet::const_iterator iter = types.begin(); iter != types.end();
+       ++iter) {
+    AutoFillType type(*iter);
+    if (GetFieldText(type) != profile.GetFieldText(type))
+      return false;
+  }
+
+  return true;
+}
+
+bool AutoFillProfile::IntersectionOfTypesHasEqualValues(
+    const AutoFillProfile& profile) const {
+  FieldTypeSet a, b, intersection;
+  GetAvailableFieldTypes(&a);
+  profile.GetAvailableFieldTypes(&b);
+  std::set_intersection(a.begin(), a.end(),
+                        b.begin(), b.end(),
+                        std::inserter(intersection, intersection.begin()));
+
+  // An empty intersection can't have equal values.
+  if (intersection.empty())
+    return false;
+
+  for (FieldTypeSet::const_iterator iter = intersection.begin();
+       iter != intersection.end(); ++iter) {
+    AutoFillType type(*iter);
+    if (GetFieldText(type) != profile.GetFieldText(type))
+      return false;
+  }
+
+  return true;
+}
+
+void AutoFillProfile::MergeWith(const AutoFillProfile& profile) {
+  FieldTypeSet a, b, intersection;
+  GetAvailableFieldTypes(&a);
+  profile.GetAvailableFieldTypes(&b);
+  std::set_difference(b.begin(), b.end(),
+                      a.begin(), a.end(),
+                      std::inserter(intersection, intersection.begin()));
+
+  for (FieldTypeSet::const_iterator iter = intersection.begin();
+       iter != intersection.end(); ++iter) {
+    AutoFillType type(*iter);
+    SetInfo(type, profile.GetFieldText(type));
+  }
+}
+
 string16 AutoFillProfile::PreviewSummary() const {
   // Fetch the components of the summary string.  Any or all of these
   // may be an empty string.
   string16 first_name = GetFieldText(AutoFillType(NAME_FIRST));
   string16 last_name = GetFieldText(AutoFillType(NAME_LAST));
   string16 address = GetFieldText(AutoFillType(ADDRESS_HOME_LINE1));
 
   // String separators depend (below) on the existence of the various fields.
   bool have_first_name = first_name.length() > 0;
   bool have_last_name = last_name.length() > 0;
@@ skipping 113 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)));
 }