A bit of STL-ified cleanup in the PersonalDataManager code

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"
@@ skipping 23 matching lines @@
 
   bool operator()(const T& form_group) {
     return form_group.guid() == guid_;
   }
 
  private:
   std::string guid_;
 };
 
 template<typename T>
+class FormGroupGUIDMatchesFunctor<T *> {
+ public:
+  explicit FormGroupGUIDMatchesFunctor(const std::string& guid) : guid_(guid) {}
+
+  bool operator()(const T* form_group) {
+    return form_group->guid() == guid_;
+  }
+
+ private:
+  std::string guid_;
+};
+
+template<typename T>
 class DereferenceFunctor {
  public:
   template<typename T_Iterator>
   const T& operator()(const T_Iterator& iterator) {
     return *iterator;
   }
 };
 
 template<typename T>
 T* address_of(T& v) {
   return &v;
 }
 
-bool FindInProfilesByGUID(const std::vector<AutoFillProfile>& profiles,
-                          const std::string& guid) {
-  for (std::vector<AutoFillProfile>::const_iterator iter = profiles.begin();
-       iter != profiles.end();
-       ++iter) {
-    if (iter->guid() == guid)
-      return true;
-  }
-  return false;
-}
-
-bool FindInScopedProfilesByGUID(const ScopedVector<AutoFillProfile>& profiles,
-                                const std::string& guid) {
-  for (std::vector<AutoFillProfile*>::const_iterator iter = profiles.begin();
-       iter != profiles.end();
-       ++iter) {
-    if ((*iter)->guid() == guid)
-      return true;
-  }
-  return false;
-}
-
-bool FindInCreditCardsByGUID(const std::vector<CreditCard>& credit_cards,
-                             const std::string& guid) {
-  for (std::vector<CreditCard>::const_iterator iter = credit_cards.begin();
-       iter != credit_cards.end();
-       ++iter) {
-    if (iter->guid() == guid)
-      return true;
-  }
-  return false;
-}
-
-bool FindInScopedCreditCardsByGUID(
-    const ScopedVector<CreditCard>& credit_cards, const std::string& guid) {
-  for (std::vector<CreditCard*>::const_iterator iter =
-          credit_cards.begin();
-       iter != credit_cards.end();
-       ++iter) {
-    if ((*iter)->guid() == guid)
-      return true;
-  }
-  return false;
+template<typename T, typename C>
+bool FindByGUID(const C& container, const std::string& guid) {
+  return std::find_if(container.begin(), container.end(),
+                      FormGroupGUIDMatchesFunctor<T>(guid)) != container.end();
 }
 
 }  // namespace
 
 PersonalDataManager::~PersonalDataManager() {
   CancelPendingQuery(&pending_profiles_query_);
   CancelPendingQuery(&pending_creditcards_query_);
 }
 
 void PersonalDataManager::OnWebDataServiceRequestDone(
@@ skipping 211 matching lines @@
 
   WebDataService* wds = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!wds)
     return;
 
   // Any profiles that are not in the new profile list should be removed from
   // the web database.
   for (std::vector<AutoFillProfile*>::const_iterator iter =
            web_profiles_.begin();
        iter != web_profiles_.end(); ++iter) {
-    if (!FindInProfilesByGUID(*profiles, (*iter)->guid()))
+    if (!FindByGUID<AutoFillProfile>(*profiles, (*iter)->guid()))
       wds->RemoveAutoFillProfileGUID((*iter)->guid());
   }
 
   // Update the web database with the existing profiles.
   for (std::vector<AutoFillProfile>::iterator iter = profiles->begin();
        iter != profiles->end(); ++iter) {
-    if (FindInScopedProfilesByGUID(web_profiles_, iter->guid()))
+    if (FindByGUID<AutoFillProfile*>(web_profiles_, iter->guid()))
       wds->UpdateAutoFillProfileGUID(*iter);
   }
 
   // Add the new profiles to the web database.
   for (std::vector<AutoFillProfile>::iterator iter = profiles->begin();
        iter != profiles->end(); ++iter) {
-    if (!FindInScopedProfilesByGUID(web_profiles_, iter->guid()))
+    if (!FindByGUID<AutoFillProfile*>(web_profiles_, iter->guid()))
       wds->AddAutoFillProfileGUID(*iter);
   }
 
   // Copy in the new profiles.
   web_profiles_.reset();
   for (std::vector<AutoFillProfile>::iterator iter = profiles->begin();
        iter != profiles->end(); ++iter) {
     web_profiles_.push_back(new AutoFillProfile(*iter));
   }
 
@@ skipping 18 matching lines @@
   SetUniqueCreditCardLabels(credit_cards);
 
   WebDataService* wds = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!wds)
     return;
 
   // Any credit cards that are not in the new credit card list should be
   // removed.
   for (std::vector<CreditCard*>::const_iterator iter = credit_cards_.begin();
        iter != credit_cards_.end(); ++iter) {
-    if (!FindInCreditCardsByGUID(*credit_cards, (*iter)->guid()))
+    if (!FindByGUID<CreditCard>(*credit_cards, (*iter)->guid()))
       wds->RemoveCreditCardGUID((*iter)->guid());
   }
 
   // Update the web database with the existing credit cards.
   for (std::vector<CreditCard>::iterator iter = credit_cards->begin();
        iter != credit_cards->end(); ++iter) {
-    if (FindInScopedCreditCardsByGUID(credit_cards_, iter->guid()))
+    if (FindByGUID<CreditCard*>(credit_cards_, iter->guid()))
       wds->UpdateCreditCardGUID(*iter);
   }
 
   // Add the new credit cards to the web database.
   for (std::vector<CreditCard>::iterator iter = credit_cards->begin();
        iter != credit_cards->end(); ++iter) {
-    if (!FindInScopedCreditCardsByGUID(credit_cards_, iter->guid()))
+    if (!FindByGUID<CreditCard*>(credit_cards_, iter->guid()))
       wds->AddCreditCardGUID(*iter);
   }
 
   // Copy in the new credit cards.
   credit_cards_.reset();
   for (std::vector<CreditCard>::iterator iter = credit_cards->begin();
        iter != credit_cards->end(); ++iter) {
     credit_cards_.push_back(new CreditCard(*iter));
   }
 
@@ skipping 398 matching lines @@
     }
 
     creditcards.push_back(**iter);
   }
 
   if (!merged)
     creditcards.push_back(*imported_credit_card_);
 
   SetCreditCards(&creditcards);
 }