retry r168247: more autofill refactoring

makes AutofillProfile and CreditCard better resemble one another. Much code deleted.

BUG=none

fix: revert change to guid() that made it return a reference.

Review URL: https://codereview.chromium.org/11299046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168304 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 12 deletions

diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc
index 9da139f..e355947 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -106,20 +106,20 @@ class TestPersonalDataManager : public PersonalDataManager {
     credit_cards_.push_back(credit_card);
   }
 
-  virtual void RemoveProfile(const std::string& guid) OVERRIDE {
-    AutofillProfile* profile = GetProfileWithGUID(guid.c_str());
-
-    web_profiles_.erase(
-        std::remove(web_profiles_.begin(), web_profiles_.end(), profile),
-        web_profiles_.end());
-  }
-
-  virtual void RemoveCreditCard(const std::string& guid) OVERRIDE {
+  virtual void RemoveByGUID(const std::string& guid) OVERRIDE {
     CreditCard* credit_card = GetCreditCardWithGUID(guid.c_str());
+    if (credit_card) {
+      credit_cards_.erase(
+          std::remove(credit_cards_.begin(), credit_cards_.end(), credit_card),
+          credit_cards_.end());
+    }
 
-    credit_cards_.erase(
-        std::remove(credit_cards_.begin(), credit_cards_.end(), credit_card),
-        credit_cards_.end());
+    AutofillProfile* profile = GetProfileWithGUID(guid.c_str());
+    if (profile) {
+      web_profiles_.erase(
+          std::remove(web_profiles_.begin(), web_profiles_.end(), profile),
+          web_profiles_.end());
+    }
   }
 
   void ClearAutofillProfiles() {