Split Autofill webdata

chrome/browser/sync/test/integration/autofill_helper.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 "chrome/browser/sync/test/integration/autofill_helper.h"
 
+#include "chrome/browser/api/webdata/autofill_web_data_service.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.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/web_database.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/thread_observer_helper.h"
 #include "components/autofill/browser/autofill_common_test.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/personal_data_manager.h"
 #include "components/autofill/browser/personal_data_manager_observer.h"
 #include "components/autofill/common/form_field_data.h"
 
@@ skipping 28 matching lines @@
 };
 
 void RemoveKeyDontBlockForSync(int profile, const AutofillKey& key) {
   WaitableEvent done_event(false, false);
   scoped_refptr<AutofillDBThreadObserverHelper> observer_helper(
       new AutofillDBThreadObserverHelper());
   observer_helper->Init();
 
   EXPECT_CALL(*observer_helper->observer(), Observe(_, _, _)).
       WillOnce(SignalEvent(&done_event));
-  scoped_refptr<WebDataService> wds =
+  scoped_refptr<AutofillWebDataService> wds =
       autofill_helper::GetWebDataService(profile);
   wds->RemoveFormValueForElementName(key.name(), key.value());
   done_event.Wait();
 }
 
 void RunOnDBThreadAndSignal(base::Closure task,
                             base::WaitableEvent* done_event) {
   if (!task.is_null()) {
     task.Run();
   }
   done_event->Signal();
 }
 
 void RunOnDBThreadAndBlock(base::Closure task) {
   WaitableEvent done_event(false, false);
   BrowserThread::PostTask(BrowserThread::DB,
                           FROM_HERE,
                           Bind(&RunOnDBThreadAndSignal, task, &done_event));
   done_event.Wait();
 }
 
-void GetAllAutofillEntriesOnDBThread(WebDataService* wds,
+void GetAllAutofillEntriesOnDBThread(AutofillWebDataService* wds,
                                      std::vector<AutofillEntry>* entries) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   AutofillTable::FromWebDatabase(
       wds->GetDatabase())->GetAllAutofillEntries(entries);
 }
 
-std::vector<AutofillEntry> GetAllAutofillEntries(WebDataService* wds) {
+std::vector<AutofillEntry> GetAllAutofillEntries(AutofillWebDataService* wds) {
   std::vector<AutofillEntry> entries;
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   RunOnDBThreadAndBlock(Bind(&GetAllAutofillEntriesOnDBThread,
                              Unretained(wds),
                              &entries));
   return entries;
 }
 
 // UI thread returns from the update operations on the DB thread and schedules
 // the sync. This function blocks until after this scheduled sync is complete by
@@ skipping 38 matching lines @@
       break;
     case PROFILE_NULL:
       autofill_test::SetProfileInfoWithGuid(&profile,
           "FE461507-7E13-4198-8E66-74C7DB6D8322",
           "", "", "", "", "", "", "", "", "", "", "", "");
       break;
   }
   return profile;
 }
 
-scoped_refptr<WebDataService> GetWebDataService(int index) {
-  return WebDataService::FromBrowserContext(test()->GetProfile(index));
+scoped_refptr<AutofillWebDataService> GetWebDataService(int index) {
+  return AutofillWebDataService::FromBrowserContext(test()->GetProfile(index));
 }
 
 PersonalDataManager* GetPersonalDataManager(int index) {
   return PersonalDataManagerFactory::GetForProfile(test()->GetProfile(index));
 }
 
 void AddKeys(int profile, const std::set<AutofillKey>& keys) {
   std::vector<FormFieldData> form_fields;
   for (std::set<AutofillKey>::const_iterator i = keys.begin();
        i != keys.end();
        ++i) {
     FormFieldData field;
     field.name = i->name();
     field.value = i->value();
     form_fields.push_back(field);
   }
 
   WaitableEvent done_event(false, false);
   scoped_refptr<AutofillDBThreadObserverHelper> observer_helper(
       new AutofillDBThreadObserverHelper());
   observer_helper->Init();
 
   EXPECT_CALL(*observer_helper->observer(), Observe(_, _, _)).
       WillOnce(SignalEvent(&done_event));
-  scoped_refptr<WebDataService> wds = GetWebDataService(profile);
+  scoped_refptr<AutofillWebDataService> wds = GetWebDataService(profile);
   wds->AddFormFields(form_fields);
   done_event.Wait();
   BlockForPendingDBThreadTasks();
 }
 
 void RemoveKey(int profile, const AutofillKey& key) {
   RemoveKeyDontBlockForSync(profile, key);
   BlockForPendingDBThreadTasks();
 }
 
 void RemoveKeys(int profile) {
   std::set<AutofillEntry> keys = GetAllKeys(profile);
   for (std::set<AutofillEntry>::const_iterator it = keys.begin();
        it != keys.end(); ++it) {
     RemoveKeyDontBlockForSync(profile, it->key());
   }
   BlockForPendingDBThreadTasks();
 }
 
 std::set<AutofillEntry> GetAllKeys(int profile) {
-  scoped_refptr<WebDataService> wds = GetWebDataService(profile);
+  scoped_refptr<AutofillWebDataService> wds = GetWebDataService(profile);
   std::vector<AutofillEntry> all_entries = GetAllAutofillEntries(wds);
   std::set<AutofillEntry> all_keys;
   for (std::vector<AutofillEntry>::const_iterator it = all_entries.begin();
        it != all_entries.end(); ++it) {
     all_keys.insert(*it);
   }
   return all_keys;
 }
 
 bool KeysMatch(int profile_a, int profile_b) {
@@ skipping 116 matching lines @@
     if (!ProfilesMatch(0, i)) {
       LOG(ERROR) << "Profile " << i << "does not contain the same autofill "
                                        "profiles as profile 0.";
       return false;
     }
   }
   return true;
 }
 
 }  // namespace autofill_helper