Rip autofill code out of webdataservice

chrome/browser/webdata/web_data_service_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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "chrome/browser/webdata/autofill_table.h"
-#include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/browser/webdata/autofill_web_data_service_impl.h"
 #include "chrome/browser/webdata/web_data_service_test_util.h"
 #include "chrome/browser/webdata/web_database_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/thread_observer_helper.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/common/form_field_data.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_thread.h"
@@ skipping 42 matching lines @@
   virtual void SetUp() {
     db_thread_.Start();
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base::FilePath path = temp_dir_.path().AppendASCII("TestWebDB");
 
     wdbs_ = new WebDatabaseService(path);
     wdbs_->AddTable(scoped_ptr<WebDatabaseTable>(new AutofillTable()));
     wdbs_->LoadDatabase(WebDatabaseService::InitCallback());
 
-    wds_ = new WebDataService(wdbs_,
+    wds_ = new AutofillWebDataServiceImpl(wdbs_,
         WebDataServiceBase::ProfileErrorCallback());
     wds_->Init();
   }
 
   virtual void TearDown() {
     wds_->ShutdownOnUIThread();
     wdbs_->ShutdownDatabase();
     wds_ = NULL;
     wdbs_ = NULL;
     WaitForDatabaseThread();
 
     MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
     MessageLoop::current()->Run();
     db_thread_.Stop();
   }
 
   void WaitForDatabaseThread() {
     base::WaitableEvent done(false, false);
     BrowserThread::PostTask(
         BrowserThread::DB,
         FROM_HERE,
         base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
     done.Wait();
   }
 
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
   base::FilePath profile_dir_;
-  scoped_refptr<WebDataService> wds_;
+  scoped_refptr<AutofillWebDataService> wds_;
   scoped_refptr<WebDatabaseService> wdbs_;
   base::ScopedTempDir temp_dir_;
 };
 
 class WebDataServiceAutofillTest : public WebDataServiceTest {
  public:
   WebDataServiceAutofillTest()
       : WebDataServiceTest(),
         unique_id1_(1),
         unique_id2_(2),
@@ skipping 67 matching lines @@
   const AutofillChange expected_changes[] = {
     AutofillChange(AutofillChange::ADD, AutofillKey(name1_, value1_)),
     AutofillChange(AutofillChange::ADD, AutofillKey(name2_, value2_))
   };
 
   // This will verify that the correct notification is triggered,
   // passing the correct list of autofill keys in the details.
   EXPECT_CALL(
       *observer_helper_->observer(),
       Observe(int(chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED),
-              content::Source<WebDataService>(wds_.get()),
+              content::Source<AutofillWebDataService>(wds_.get()),
               Property(&content::Details<const AutofillChangeList>::ptr,
                        Pointee(ElementsAreArray(expected_changes))))).
       WillOnce(SignalEvent(&done_event_));
 
   std::vector<FormFieldData> form_fields;
   AppendFormField(name1_, value1_, &form_fields);
   AppendFormField(name2_, value2_, &form_fields);
   wds_->AddFormFields(form_fields);
 
   // The event will be signaled when the mock observer is notified.
@@ skipping 25 matching lines @@
   done_event_.TimedWait(test_timeout_);
 
   // This will verify that the correct notification is triggered,
   // passing the correct list of autofill keys in the details.
   const AutofillChange expected_changes[] = {
     AutofillChange(AutofillChange::REMOVE, AutofillKey(name1_, value1_))
   };
   EXPECT_CALL(
       *observer_helper_->observer(),
       Observe(int(chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED),
-              content::Source<WebDataService>(wds_.get()),
+              content::Source<AutofillWebDataService>(wds_.get()),
               Property(&content::Details<const AutofillChangeList>::ptr,
                        Pointee(ElementsAreArray(expected_changes))))).
       WillOnce(SignalEvent(&done_event_));
   wds_->RemoveFormValueForElementName(name1_, value1_);
 
   // The event will be signaled when the mock observer is notified.
   done_event_.TimedWait(test_timeout_);
 }
 
 TEST_F(WebDataServiceAutofillTest, FormFillRemoveMany) {
@@ skipping 12 matching lines @@
 
   // This will verify that the correct notification is triggered,
   // passing the correct list of autofill keys in the details.
   const AutofillChange expected_changes[] = {
     AutofillChange(AutofillChange::REMOVE, AutofillKey(name1_, value1_)),
     AutofillChange(AutofillChange::REMOVE, AutofillKey(name2_, value2_))
   };
   EXPECT_CALL(
       *observer_helper_->observer(),
       Observe(int(chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED),
-              content::Source<WebDataService>(wds_.get()),
+              content::Source<AutofillWebDataService>(wds_.get()),
               Property(&content::Details<const AutofillChangeList>::ptr,
                        Pointee(ElementsAreArray(expected_changes))))).
       WillOnce(SignalEvent(&done_event_));
   wds_->RemoveFormElementsAddedBetween(t, t + one_day);
 
   // The event will be signaled when the mock observer is notified.
   done_event_.TimedWait(test_timeout_);
 }
 
 TEST_F(WebDataServiceAutofillTest, ProfileAdd) {
   AutofillProfile profile;
 
   // Check that GUID-based notification was sent.
   const AutofillProfileChange expected_change(
       AutofillProfileChange::ADD, profile.guid(), &profile);
   EXPECT_CALL(
       *observer_helper_->observer(),
       Observe(int(chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED),
-              content::Source<WebDataService>(wds_.get()),
+              content::Source<AutofillWebDataService>(wds_.get()),
               Property(&content::Details<const AutofillProfileChange>::ptr,
                        Pointee(expected_change)))).
       WillOnce(SignalEvent(&done_event_));
 
   wds_->AddAutofillProfile(profile);
   done_event_.TimedWait(test_timeout_);
 
   // Check that it was added.
   AutofillWebDataServiceConsumer<std::vector<AutofillProfile*> > consumer;
   WebDataService::Handle handle = wds_->GetAutofillProfiles(&consumer);
@@ skipping 22 matching lines @@
   ASSERT_EQ(1U, consumer.result().size());
   EXPECT_EQ(profile, *consumer.result()[0]);
   STLDeleteElements(&consumer.result());
 
   // Check that GUID-based notification was sent.
   const AutofillProfileChange expected_change(
       AutofillProfileChange::REMOVE, profile.guid(), NULL);
   EXPECT_CALL(
       *observer_helper_->observer(),
       Observe(int(chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED),
-              content::Source<WebDataService>(wds_.get()),
+              content::Source<AutofillWebDataService>(wds_.get()),
               Property(&content::Details<const AutofillProfileChange>::ptr,
                        Pointee(expected_change)))).
       WillOnce(SignalEvent(&done_event_));
 
   // Remove the profile.
   wds_->RemoveAutofillProfile(profile.guid());
   done_event_.TimedWait(test_timeout_);
 
   // Check that it was removed.
   AutofillWebDataServiceConsumer<std::vector<AutofillProfile*> > consumer2;
@@ skipping 27 matching lines @@
   STLDeleteElements(&consumer.result());
 
   AutofillProfile profile1_changed(profile1);
   profile1_changed.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Bill"));
   const AutofillProfileChange expected_change(
       AutofillProfileChange::UPDATE, profile1.guid(), &profile1_changed);
 
   EXPECT_CALL(
       *observer_helper_->observer(),
       Observe(int(chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED),
-              content::Source<WebDataService>(wds_.get()),
+              content::Source<AutofillWebDataService>(wds_.get()),
               Property(&content::Details<const AutofillProfileChange>::ptr,
                        Pointee(expected_change)))).
       WillOnce(SignalEvent(&done_event_));
 
   // Update the profile.
   wds_->UpdateAutofillProfile(profile1_changed);
   done_event_.TimedWait(test_timeout_);
 
   // Check that the updates were made.
   AutofillWebDataServiceConsumer<std::vector<AutofillProfile*> > consumer2;
@@ skipping 120 matching lines @@
   ASSERT_EQ(1U, card_consumer.result().size());
   EXPECT_EQ(credit_card, *card_consumer.result()[0]);
   STLDeleteElements(&card_consumer.result());
 
   // Check that GUID-based notification was sent for the profile.
   const AutofillProfileChange expected_profile_change(
       AutofillProfileChange::REMOVE, profile.guid(), NULL);
   EXPECT_CALL(
       *observer_helper_->observer(),
       Observe(int(chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED),
-              content::Source<WebDataService>(wds_.get()),
+              content::Source<AutofillWebDataService>(wds_.get()),
               Property(&content::Details<const AutofillProfileChange>::ptr,
                        Pointee(expected_profile_change)))).
       WillOnce(SignalEvent(&done_event_));
 
   // Remove the profile using time range of "all time".
-  wds_->RemoveAutofillProfilesAndCreditCardsModifiedBetween(Time(), Time());
+  wds_->RemoveAutofillDataModifiedBetween(Time(), Time());
   done_event_.TimedWait(test_timeout_);
   WaitForDatabaseThread();
 
   // Check that the profile was removed.
   AutofillWebDataServiceConsumer<std::vector<AutofillProfile*> >
       profile_consumer2;
   WebDataService::Handle handle2 =
       wds_->GetAutofillProfiles(&profile_consumer2);
   MessageLoop::current()->Run();
   EXPECT_EQ(handle2, profile_consumer2.handle());
   ASSERT_EQ(0U, profile_consumer2.result().size());
 
   // Check that the credit card was removed.
   AutofillWebDataServiceConsumer<std::vector<CreditCard*> > card_consumer2;
   handle2 = wds_->GetCreditCards(&card_consumer2);
   MessageLoop::current()->Run();
   EXPECT_EQ(handle2, card_consumer2.handle());
   ASSERT_EQ(0U, card_consumer2.result().size());
 }