AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/autofill/personal_data_manager.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/personal_data_manager.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/phone_number.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
 
 // The minimum number of fields that must contain user data and have known types
-// before autofill will attempt to import the data into a profile.
-const int kMinImportSize = 5;
+// before AutoFill will attempt to import the data into a profile.
+const int kMinImportSize = 3;
 
 const char kUnlabeled[] = "Unlabeled";
 
 }  // namespace
 
 PersonalDataManager::~PersonalDataManager() {
   CancelPendingQuery(&pending_profiles_query_);
   CancelPendingQuery(&pending_creditcards_query_);
 }
 
@@ skipping 34 matching lines @@
     }
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // PersonalDataManager,
 // views::ButtonListener implementations
 void PersonalDataManager::OnAutoFillDialogApply(
     std::vector<AutoFillProfile>* profiles,
     std::vector<CreditCard>* credit_cards) {
-  // |profiles| may be NULL
-  // |credit_cards| may be NULL
+  // |profiles| may be NULL.
+  // |credit_cards| may be NULL.
   if (profiles) {
     CancelPendingQuery(&pending_profiles_query_);
     SetProfiles(profiles);
   }
   if (credit_cards) {
     CancelPendingQuery(&pending_creditcards_query_);
     SetCreditCards(credit_cards);
   }
 }
 
@@ skipping 105 matching lines @@
   // importing the data.
   if (importable_fields + importable_credit_card_fields < kMinImportSize)
     return false;
 
   if (importable_fields == 0)
     imported_profile_.reset();
 
   if (importable_credit_card_fields == 0)
     imported_credit_card_.reset();
 
+  {
+    // We're now done with the unique IDs, and SaveImportedProfile() needs the
+    // lock, so release it.
+    AutoUnlock unlock(unique_ids_lock_);
+
+    // We always save imported profiles.
+    SaveImportedProfile();
+  }
+
   return true;
 }
 
-void PersonalDataManager::SaveImportedFormData() {
-  if (profile_->IsOffTheRecord())
-    return;
-
-  if (imported_profile_.get()) {
-    imported_profile_->set_label(ASCIIToUTF16(kUnlabeled));
-
-    std::vector<AutoFillProfile> profiles;
-    profiles.push_back(*imported_profile_);
-    SetProfiles(&profiles);
-  }
-
-  if (imported_credit_card_.get()) {
-    imported_credit_card_->set_label(ASCIIToUTF16(kUnlabeled));
-
-    std::vector<CreditCard> credit_cards;
-    credit_cards.push_back(*imported_credit_card_);
-    SetCreditCards(&credit_cards);
-  }
-}
-
 void PersonalDataManager::GetImportedFormData(AutoFillProfile** profile,
                                               CreditCard** credit_card) {
   DCHECK(profile);
   DCHECK(credit_card);
 
   if (imported_profile_.get()) {
     imported_profile_->set_label(ASCIIToUTF16(kUnlabeled));
   }
   *profile = imported_profile_.get();
 
   if (imported_credit_card_.get()) {
     imported_credit_card_->set_label(ASCIIToUTF16(kUnlabeled));
   }
   *credit_card = imported_credit_card_.get();
 }
 
 void PersonalDataManager::SetProfiles(std::vector<AutoFillProfile>* profiles) {
   if (profile_->IsOffTheRecord())
     return;
 
   SetUniqueProfileLabels(profiles);
 
   WebDataService* wds = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!wds)
     return;
 
   AutoLock lock(unique_ids_lock_);
+
   // Remove the unique IDs of the new set of profiles from the unique ID set.
   for (std::vector<AutoFillProfile>::iterator iter = profiles->begin();
        iter != profiles->end(); ++iter) {
     if (iter->unique_id() != 0)
       unique_profile_ids_.erase(iter->unique_id());
   }
 
   // Any remaining IDs are not in the new profile list and should be removed
   // from the web database.
   for (std::set<int>::iterator iter = unique_profile_ids_.begin();
@@ skipping 44 matching lines @@
   if (profile_->IsOffTheRecord())
     return;
 
   SetUniqueCreditCardLabels(credit_cards);
 
   WebDataService* wds = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!wds)
     return;
 
   AutoLock lock(unique_ids_lock_);
+
   // Remove the unique IDs of the new set of credit cards from the unique ID
   // set.
   for (std::vector<CreditCard>::iterator iter = credit_cards->begin();
        iter != credit_cards->end(); ++iter) {
     if (iter->unique_id() != 0)
       unique_creditcard_ids_.erase(iter->unique_id());
   }
 
   // Any remaining IDs are not in the new credit card list and should be removed
   // from the web database.
@@ skipping 263 matching lines @@
     // Start at the second element because the first label should not be
     // renamed.  The appended label number starts at 2, because the first label
     // has an implicit index of 1.
     for (size_t i = 1; i < iter->second.size(); ++i) {
       string16 newlabel = iter->second[i]->Label() +
           UintToString16(static_cast<unsigned int>(i + 1));
       iter->second[i]->set_label(newlabel);
     }
   }
 }
+
+void PersonalDataManager::SaveImportedProfile() {
+  if (profile_->IsOffTheRecord())
+    return;
+
+  if (!imported_profile_.get())
+    return;
+
+  // Set to true if |imported_profile_| is merged into the profile list.
+  bool merged = false;
+
+  imported_profile_->set_label(ASCIIToUTF16(kUnlabeled));
+
+  // Don't save a web profile if the data in the profile is a subset of an
+  // auxiliary profile.
+  for (std::vector<AutoFillProfile*>::const_iterator iter =
+           auxiliary_profiles_.begin();
+       iter != auxiliary_profiles_.end(); ++iter) {
+    if (imported_profile_->IsSubsetOf(**iter))
+      return;
+  }
+
+  std::vector<AutoFillProfile> profiles;
+  for (std::vector<AutoFillProfile*>::const_iterator iter =
+           web_profiles_.begin();
+       iter != web_profiles_.end(); ++iter) {
+    if (imported_profile_->IsSubsetOf(**iter)) {
+      // In this case, the existing profile already contains all of the data
+      // in |imported_profile|, so consider the profiles already merged.
+      merged = true;
+    } else if ((*iter)->IntersectionOfTypesHasEqualValues(
+        *imported_profile_)) {
+      // |imported_profile| contains all of the data in this profile, plus
+      // more.
+      merged = true;
+      (*iter)->MergeWith(*imported_profile_);
+    }
+
+    profiles.push_back(**iter);
+  }
+
+  if (!merged)
+    profiles.push_back(*imported_profile_);
+
+  SetProfiles(&profiles);
+}