Add Delete Support to New Autofill UI

chrome/browser/autofill/autofill_manager_unittest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/tuple.h"
@@ skipping 21 matching lines @@
 #include "content/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/rect.h"
 #include "webkit/forms/form_data.h"
 #include "webkit/forms/form_field.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"

[Ilya Sherman, 2012/04/19 21:01:57]

nit: alpha-sort

[csharp, 2012/04/20 15:03:18]

Done.

 
 using content::BrowserThread;
 using content::WebContents;
 using testing::_;
 using webkit::forms::FormData;
 using webkit::forms::FormField;
 
 namespace {
 
 // The page ID sent to the AutofillManager from the RenderView, used to send
@@ skipping 22 matching lines @@
 
   AutofillProfile* GetProfileWithGUID(const char* guid) {
     for (std::vector<AutofillProfile *>::iterator it = web_profiles_.begin();
          it != web_profiles_.end(); ++it) {
       if (!(*it)->guid().compare(guid))
         return *it;
     }
     return NULL;
   }
 
+  CreditCard* GetCreditCardWithGUID(const char* guid) {
+    for (std::vector<CreditCard *>::iterator it = credit_cards_.begin();
+         it != credit_cards_.end(); ++it){
+      if (!(*it)->guid().compare(guid))
+        return *it;
+    }
+    return NULL;
+  }
+
   void AddProfile(AutofillProfile* profile) {
     web_profiles_->push_back(profile);
   }
 
   void AddCreditCard(CreditCard* credit_card) {
     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());

[Ilya Sherman, 2012/04/19 21:01:57]

nit: Isn't just """std::remove(web_profiles_.begin(), web_profiles_.end(),
profile)""" sufficient?  (Same applies below.)

[csharp, 2012/04/20 15:03:18]

I don't believe so. std::remove (as I understand it), basically moves all the
non deleted elements to the front of the vector, but it doesn't actually change
the length of the vector. However many elements were deleted is how many
undefined elements there are at the end of the vector, so we then delete them.

I could be wrong in this understanding, but I did try just
"std:remove*web_profiles_.begin(), web_profiles_.end(), profile)" and it didn't
work.

[Ilya Sherman, 2012/04/20 21:30:48]

Ah, I think you're right -- sorry 'bout that.  I guess that actually makes sense
given that std::remove is supposed to work with raw arrays as well...

+  }
+
+  virtual void RemoveCreditCard(const std::string& guid) OVERRIDE {
+    CreditCard* credit_card = GetCreditCardWithGUID(guid.c_str());
+
+    credit_cards_.erase(
+        std::remove(credit_cards_.begin(), credit_cards_.end(), credit_card),
+        credit_cards_.end());
+  }
+
   void ClearAutofillProfiles() {
     web_profiles_.reset();
   }
 
   void ClearCreditCards() {
     credit_cards_.reset();
   }
 
   void CreateTestCreditCardsYearAndMonth(const char* year, const char* month) {
     ClearCreditCards();
@@ skipping 395 matching lines @@
   }
 
   const std::string GetSubmittedFormSignature() {
     return submitted_form_signature_;
   }
 
   AutofillProfile* GetProfileWithGUID(const char* guid) {
     return personal_data_->GetProfileWithGUID(guid);
   }
 
+  CreditCard* GetCreditCardWithGUID(const char* guid) {
+    return personal_data_->GetCreditCardWithGUID(guid);
+  }
+
   void AddProfile(AutofillProfile* profile) {
     personal_data_->AddProfile(profile);
   }
 
   void AddCreditCard(CreditCard* credit_card) {
     personal_data_->AddCreditCard(credit_card);
   }
 
   int GetPackedCreditCardID(int credit_card_id) {
     std::string credit_card_guid =
@@ skipping 2403 matching lines @@
   autofill_manager_->ClearSentStates();
 
   // When a new render_view is created, we send the state even if it's the
   // same.
   UpdatePasswordSyncState(true);
   EXPECT_EQ(1u, autofill_manager_->GetSentStates().size());
   EXPECT_FALSE(autofill_manager_->GetSentStates()[0]);
   autofill_manager_->ClearSentStates();
 }
 
+TEST_F(AutofillManagerTest, RemoveProfile) {
+  // Add and remove an Autofill profile.
+  AutofillProfile* profile = new AutofillProfile;
+  std::string guid = "00000000-0000-0000-0000-000000000102";
+  profile->set_guid(guid.c_str());
+  autofill_manager_->AddProfile(profile);
+
+  GUIDPair guid_pair(guid, 1);
+  GUIDPair empty(std::string(), 0);
+  int id = PackGUIDs(empty, guid_pair);
+
+  autofill_manager_->RemoveAutofillProfileOrCreditCard(id);
+
+  EXPECT_FALSE(autofill_manager_->GetProfileWithGUID(guid.c_str()));
+}
+
+TEST_F(AutofillManagerTest, RemoveCreditCard){
+  // Add and remove an Autofill credit card.
+  CreditCard* credit_card = new CreditCard;
+  std::string guid = "00000000-0000-0000-0000-000000100007";
+  credit_card->set_guid(guid.c_str());
+  autofill_manager_->AddCreditCard(credit_card);
+
+  GUIDPair guid_pair(guid, 1);
+  GUIDPair empty(std::string(), 0);
+  int id = PackGUIDs(guid_pair, empty);
+
+  autofill_manager_->RemoveAutofillProfileOrCreditCard(id);
+
+  EXPECT_FALSE(autofill_manager_->GetCreditCardWithGUID(guid.c_str()));
+}
+
 namespace {
 
 class MockAutofillExternalDelegate : public TestAutofillExternalDelegate {
  public:
   explicit MockAutofillExternalDelegate(TabContentsWrapper* wrapper,
                                         AutofillManager* autofill_manager)
       : TestAutofillExternalDelegate(wrapper, autofill_manager) {}
   virtual ~MockAutofillExternalDelegate() {}
 
   MOCK_METHOD5(OnQuery, void(int query_id,
@@ skipping 47 matching lines @@
 
   AutofillManager* autofill_manager = contents_wrapper()->autofill_manager();
   EXPECT_TRUE(autofill_manager->external_delegate());
 
   AutocompleteHistoryManager* autocomplete_history_manager =
       contents_wrapper()->autocomplete_history_manager();
   EXPECT_TRUE(autocomplete_history_manager->external_delegate());
 }
 
 #endif  // OS_ANDROID