Split Autofill webdata

chrome/browser/webdata/autocomplete_syncable_service.cc

Index: chrome/browser/webdata/autocomplete_syncable_service.cc
diff --git a/chrome/browser/webdata/autocomplete_syncable_service.cc b/chrome/browser/webdata/autocomplete_syncable_service.cc
index e3499c2946a91e0638157f55653357f434727364..ff2584f77414b42de8fc45f9d3d0a3752d950436 100644
--- a/chrome/browser/webdata/autocomplete_syncable_service.cc
+++ b/chrome/browser/webdata/autocomplete_syncable_service.cc
@@ -7,9 +7,9 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/api/webdata/autofill_web_data_service.h"
 #include "chrome/browser/profiles/profile.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 "content/public/browser/browser_thread.h"
@@ -89,14 +89,14 @@ void* UserDataKey() {
 }  // namespace
 
 AutocompleteSyncableService::AutocompleteSyncableService(
-    WebDataService* web_data_service)
+    AutofillWebDataService* web_data_service)
     : web_data_service_(web_data_service),
       cull_expired_entries_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   DCHECK(web_data_service_);
   notification_registrar_.Add(
       this, chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
-      content::Source<WebDataService>(web_data_service));
+      content::Source<AutofillWebDataService>(web_data_service));
 }
 
 AutocompleteSyncableService::~AutocompleteSyncableService() {
@@ -105,14 +105,14 @@ AutocompleteSyncableService::~AutocompleteSyncableService() {
 
 // static
 void AutocompleteSyncableService::CreateForWebDataService(
-    WebDataService* web_data) {
+    AutofillWebDataService* web_data) {

[dhollowa, 2013/03/21 16:44:07]

web_data -> web_data_service

[Cait (Slow), 2013/03/21 23:23:27]

Done.

   web_data->GetDBUserData()->SetUserData(
       UserDataKey(), new AutocompleteSyncableService(web_data));
 }
 
 // static
 AutocompleteSyncableService* AutocompleteSyncableService::FromWebDataService(
-    WebDataService* web_data) {
+    AutofillWebDataService* web_data) {

[dhollowa, 2013/03/21 16:44:07]

web_data -> web_data_service

[Cait (Slow), 2013/03/21 23:23:27]

Done.

   return static_cast<AutocompleteSyncableService*>(
       web_data->GetDBUserData()->GetUserData(UserDataKey()));
 }
@@ -170,7 +170,7 @@ syncer::SyncMergeResult AutocompleteSyncableService::MergeDataAndStartSyncing(
     return merge_result;
   }
 
-  WebDataService::NotifyOfMultipleAutofillChanges(web_data_service_);
+  AutofillWebDataService::NotifyOfMultipleAutofillChanges(web_data_service_);
 
   syncer::SyncChangeList new_changes;
   for (AutocompleteEntryMap::iterator i = new_db_entries.begin();
@@ -287,7 +287,7 @@ syncer::SyncError AutocompleteSyncableService::ProcessSyncChanges(
         "Failed to update webdata.");
   }
 
-  WebDataService::NotifyOfMultipleAutofillChanges(web_data_service_);
+  AutofillWebDataService::NotifyOfMultipleAutofillChanges(web_data_service_);
 
   if (cull_expired_entries_) {
     // This will schedule a deletion operation on the DB thread, which will
@@ -309,7 +309,8 @@ void AutocompleteSyncableService::Observe(int type,
   // starts.
   if (!sync_processor_.get())
     return;
-  WebDataService* wds = content::Source<WebDataService>(source).ptr();
+  AutofillWebDataService* wds =

[dhollowa, 2013/03/21 16:44:07]

wds -> web_data_service

[Cait (Slow), 2013/03/21 23:23:27]

Done.

+      content::Source<AutofillWebDataService>(source).ptr();
 
   DCHECK_EQ(web_data_service_, wds);