wd5-syncableServices for try only

chrome/browser/webdata/web_data_service.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/webdata/web_data_service.h"
 
-#include "base/bind.h"
-#include "base/command_line.h"
-#include "base/message_loop.h"
 #include "base/stl_util.h"
-#include "base/threading/thread.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url.h"
-#include "chrome/browser/ui/profile_error_dialog.h"
-#include "chrome/browser/webdata/autocomplete_syncable_service.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
-#include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/token_service_table.h"
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_database_service.h"
 #include "chrome/browser/webdata/web_intents_table.h"
-#include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/common/form_field_data.h"
-#ifdef DEBUG
-#include "content/public/browser/browser_thread.h"
-#endif
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataService implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 using base::Bind;
 using base::Time;
@@ skipping 19 matching lines @@
 
 WDAppImagesResult::~WDAppImagesResult() {}
 
 WDKeywordsResult::WDKeywordsResult()
   : default_search_provider_id(0),
     builtin_keyword_version(0) {
 }
 
 WDKeywordsResult::~WDKeywordsResult() {}
 
-WebDataService::WebDataService()
-    : db_loaded_(false),
-      autocomplete_syncable_service_(NULL),
-      autofill_profile_syncable_service_(NULL) {
-  // WebDataService requires DB thread if instantiated.
-  // Set WebDataServiceFactory::GetInstance()->SetTestingFactory(&profile, NULL)
-  // if you do not want to instantiate WebDataService in your test.
-  DCHECK(BrowserThread::IsWellKnownThread(BrowserThread::DB));
+WebDataService::WebDataService(const ProfileErrorCallback& callback)
+    : WebDataServiceBase(callback) {
 }
 
 // static
 void WebDataService::NotifyOfMultipleAutofillChanges(
     WebDataService* web_data_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   if (!web_data_service)
     return;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       Bind(&NotifyOfMultipleAutofillChangesTask,
            make_scoped_refptr(web_data_service)));
 }
 
-void WebDataService::ShutdownOnUIThread() {
-  db_loaded_ = false;
-  ShutdownDatabase();
-  BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      Bind(&WebDataService::ShutdownSyncableServices, this));
-}
-
-void WebDataService::Init(const base::FilePath& path) {
-  wdbs_.reset(new WebDatabaseService(path));
-  wdbs_->LoadDatabase(Bind(&WebDataService::DatabaseInitOnDB, this));
-
-  BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      Bind(&WebDataService::InitializeSyncableServices, this));
-}
-
-void WebDataService::UnloadDatabase() {
-  if (!wdbs_)
-    return;
-  wdbs_->UnloadDatabase();
-}
-
-void WebDataService::ShutdownDatabase() {
-  if (!wdbs_)
-    return;
-  wdbs_->ShutdownDatabase();
-}
-
-void WebDataService::CancelRequest(Handle h) {
-  if (!wdbs_)
-    return;
-  wdbs_->CancelRequest(h);
-}
-
-content::NotificationSource WebDataService::GetNotificationSource() {
-  return content::Source<WebDataService>(this);
-}
-
-bool WebDataService::IsDatabaseLoaded() {
-  return db_loaded_;
-}
-
-WebDatabase* WebDataService::GetDatabase() {
-  if (!wdbs_)
-    return NULL;
-  return wdbs_->GetDatabaseOnDB();
-}
-
 //////////////////////////////////////////////////////////////////////////////
 //
 // Keywords.
 //
 //////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::AddKeyword(const TemplateURLData& data) {
   wdbs_->ScheduleDBTask(
       FROM_HERE, Bind(&WebDataService::AddKeywordImpl, this, data));
 }
@@ skipping 161 matching lines @@
 }
 
 void WebDataService::RemoveAutofillProfilesAndCreditCardsModifiedBetween(
     const Time& delete_begin,
     const Time& delete_end) {
   wdbs_->ScheduleDBTask(FROM_HERE, Bind(
       &WebDataService::RemoveAutofillProfilesAndCreditCardsModifiedBetweenImpl,
       this, delete_begin, delete_end));
 }
 
+WebDataService::WebDataService()
+    : WebDataServiceBase(ProfileErrorCallback()) {
+}
+
 WebDataService::~WebDataService() {
-  wdbs_.reset();
-  DCHECK(!autocomplete_syncable_service_);
-  DCHECK(!autofill_profile_syncable_service_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-//
-// The following methods are executed on the DB thread.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-void WebDataService::DBInitFailed(sql::InitStatus sql_status) {
-  ShowProfileErrorDialog(
-      (sql_status == sql::INIT_FAILURE) ?
-      IDS_COULDNT_OPEN_PROFILE_ERROR : IDS_PROFILE_TOO_NEW_ERROR);
-}
-
-void WebDataService::NotifyDatabaseLoadedOnUIThread() {
-  db_loaded_ = true;
-  // Notify that the database has been initialized.
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_WEB_DATABASE_LOADED,
-      content::Source<WebDataService>(this),
-      content::NotificationService::NoDetails());
-}
-
-void WebDataService::DatabaseInitOnDB(sql::InitStatus status) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  if (status == sql::INIT_OK) {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&WebDataService::NotifyDatabaseLoadedOnUIThread, this));
-  } else {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&WebDataService::DBInitFailed, this, status));
-  }
-}
-
-void WebDataService::InitializeSyncableServices() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  DCHECK(!autocomplete_syncable_service_);
-  DCHECK(!autofill_profile_syncable_service_);
-
-  autocomplete_syncable_service_ = new AutocompleteSyncableService(this);
-  autofill_profile_syncable_service_ = new AutofillProfileSyncableService(this);
-}
-
-void WebDataService::ShutdownSyncableServices() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-
-  delete autocomplete_syncable_service_;
-  autocomplete_syncable_service_ = NULL;
-  delete autofill_profile_syncable_service_;
-  autofill_profile_syncable_service_ = NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
 //
 // Keywords implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 WebDatabase::State WebDataService::AddKeywordImpl(
     const TemplateURLData& data, WebDatabase* db) {
-  db->GetKeywordTable()->AddKeyword(data);
+  KeywordTable::FromWebDatabase(db)->AddKeyword(data);
   return WebDatabase::COMMIT_NEEDED;
 }
 
 WebDatabase::State WebDataService::RemoveKeywordImpl(
     TemplateURLID id, WebDatabase* db) {
   DCHECK(id);
-  db->GetKeywordTable()->RemoveKeyword(id);
+  KeywordTable::FromWebDatabase(db)->RemoveKeyword(id);
   return WebDatabase::COMMIT_NEEDED;
 }
 
 WebDatabase::State WebDataService::UpdateKeywordImpl(
     const TemplateURLData& data, WebDatabase* db) {
-  if (!db->GetKeywordTable()->UpdateKeyword(data)) {
+  if (!KeywordTable::FromWebDatabase(db)->UpdateKeyword(data)) {
     NOTREACHED();
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
  return WebDatabase::COMMIT_NEEDED;
 }
 
 scoped_ptr<WDTypedResult> WebDataService::GetKeywordsImpl(WebDatabase* db) {
   WDKeywordsResult result;
-  db->GetKeywordTable()->GetKeywords(&result.keywords);
+  KeywordTable::FromWebDatabase(db)->GetKeywords(&result.keywords);
   result.default_search_provider_id =
-      db->GetKeywordTable()->GetDefaultSearchProviderID();
+      KeywordTable::FromWebDatabase(db)->GetDefaultSearchProviderID();
   result.builtin_keyword_version =
-      db->GetKeywordTable()->GetBuiltinKeywordVersion();
+      KeywordTable::FromWebDatabase(db)->GetBuiltinKeywordVersion();
   return scoped_ptr<WDTypedResult>(
       new WDResult<WDKeywordsResult>(KEYWORDS_RESULT, result));
 }
 
 WebDatabase::State WebDataService::SetDefaultSearchProviderImpl(
     TemplateURLID id, WebDatabase* db) {
-  if (!db->GetKeywordTable()->SetDefaultSearchProviderID(id)) {
+  if (!KeywordTable::FromWebDatabase(db)->SetDefaultSearchProviderID(id)) {
     NOTREACHED();
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
   return WebDatabase::COMMIT_NEEDED;
 }
 
 WebDatabase::State WebDataService::SetBuiltinKeywordVersionImpl(
     int version, WebDatabase* db) {
-  if (!db->GetKeywordTable()->SetBuiltinKeywordVersion(version)) {
+  if (!KeywordTable::FromWebDatabase(db)->SetBuiltinKeywordVersion(version)) {
     NOTREACHED();
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
   return WebDatabase::COMMIT_NEEDED;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Web Apps implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 WebDatabase::State WebDataService::SetWebAppImageImpl(
     const GURL& app_url, const SkBitmap& image, WebDatabase* db) {
-  db->GetWebAppsTable()->SetWebAppImage(app_url, image);
+  WebAppsTable::FromWebDatabase(db)->SetWebAppImage(app_url, image);
   return WebDatabase::COMMIT_NEEDED;
 }
 
 WebDatabase::State WebDataService::SetWebAppHasAllImagesImpl(
     const GURL& app_url, bool has_all_images, WebDatabase* db) {
-  db->GetWebAppsTable()->
-      SetWebAppHasAllImages(app_url, has_all_images);
+  WebAppsTable::FromWebDatabase(db)->SetWebAppHasAllImages(app_url,
+                                                           has_all_images);
   return WebDatabase::COMMIT_NEEDED;
 }
 
 WebDatabase::State WebDataService::RemoveWebAppImpl(
     const GURL& app_url, WebDatabase* db) {
-  db->GetWebAppsTable()->RemoveWebApp(app_url);
+  WebAppsTable::FromWebDatabase(db)->RemoveWebApp(app_url);
   return WebDatabase::COMMIT_NEEDED;
 }
 
 scoped_ptr<WDTypedResult> WebDataService::GetWebAppImagesImpl(
     const GURL& app_url, WebDatabase* db) {
   WDAppImagesResult result;
-  result.has_all_images = db->GetWebAppsTable()->GetWebAppHasAllImages(app_url);
-  db->GetWebAppsTable()->GetWebAppImages(app_url, &result.images);
+  result.has_all_images =
+      WebAppsTable::FromWebDatabase(db)->GetWebAppHasAllImages(app_url);
+  WebAppsTable::FromWebDatabase(db)->GetWebAppImages(app_url, &result.images);
   return scoped_ptr<WDTypedResult>(
       new WDResult<WDAppImagesResult>(WEB_APP_IMAGES, result));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Token Service implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 WebDatabase::State WebDataService::RemoveAllTokensImpl(WebDatabase* db) {
-  if (db->GetTokenServiceTable()->RemoveAllTokens()) {
+  if (TokenServiceTable::FromWebDatabase(db)->RemoveAllTokens()) {
     return WebDatabase::COMMIT_NEEDED;
   }
   return WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 WebDatabase::State WebDataService::SetTokenForServiceImpl(
     const std::string& service, const std::string& token, WebDatabase* db) {
-  if (db->GetTokenServiceTable()->SetTokenForService(service, token)) {
+  if (TokenServiceTable::FromWebDatabase(db)->SetTokenForService(service,
+                                                                 token)) {
     return WebDatabase::COMMIT_NEEDED;
   }
   return WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 scoped_ptr<WDTypedResult> WebDataService::GetAllTokensImpl(WebDatabase* db) {
   std::map<std::string, std::string> map;
-  db->GetTokenServiceTable()->GetAllTokens(&map);
+  TokenServiceTable::FromWebDatabase(db)->GetAllTokens(&map);
   return scoped_ptr<WDTypedResult>(
       new WDResult<std::map<std::string, std::string> >(TOKEN_RESULT, map));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Autofill implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 WebDatabase::State WebDataService::AddFormElementsImpl(
     const std::vector<FormFieldData>& fields, WebDatabase* db) {
   AutofillChangeList changes;
-  if (!db->GetAutofillTable()->AddFormFieldValues(fields, &changes)) {
+  if (!AutofillTable::FromWebDatabase(db)->AddFormFieldValues(
+          fields, &changes)) {
     NOTREACHED();
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
 
   // Post the notifications including the list of affected keys.
   // This is sent here so that work resulting from this notification will be
   // done on the DB thread, and not the UI thread.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
       content::Source<WebDataService>(this),
       content::Details<AutofillChangeList>(&changes));
 
   return WebDatabase::COMMIT_NEEDED;
 }
 
 scoped_ptr<WDTypedResult> WebDataService::GetFormValuesForElementNameImpl(
     const string16& name, const string16& prefix, int limit, WebDatabase* db) {
   std::vector<string16> values;
-  db->GetAutofillTable()->GetFormValuesForElementName(
+  AutofillTable::FromWebDatabase(db)->GetFormValuesForElementName(
       name, prefix, &values, limit);
   return scoped_ptr<WDTypedResult>(
       new WDResult<std::vector<string16> >(AUTOFILL_VALUE_RESULT, values));
 }
 
 WebDatabase::State WebDataService::RemoveFormElementsAddedBetweenImpl(
     const base::Time& delete_begin, const base::Time& delete_end,
     WebDatabase* db) {
   AutofillChangeList changes;
 
-  if (db->GetAutofillTable()->RemoveFormElementsAddedBetween(
+  if (AutofillTable::FromWebDatabase(db)->RemoveFormElementsAddedBetween(
       delete_begin, delete_end, &changes)) {
     if (!changes.empty()) {
       // Post the notifications including the list of affected keys.
       // This is sent here so that work resulting from this notification
       // will be done on the DB thread, and not the UI thread.
       content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
           content::Source<WebDataService>(this),
           content::Details<AutofillChangeList>(&changes));
     }
     return WebDatabase::COMMIT_NEEDED;
   }
   return WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 WebDatabase::State WebDataService::RemoveExpiredFormElementsImpl(
     WebDatabase* db) {
   AutofillChangeList changes;
 
-  if (db->GetAutofillTable()->RemoveExpiredFormElements(&changes)) {
+  if (AutofillTable::FromWebDatabase(db)->RemoveExpiredFormElements(&changes)) {
     if (!changes.empty()) {
       // Post the notifications including the list of affected keys.
       // This is sent here so that work resulting from this notification
       // will be done on the DB thread, and not the UI thread.
       content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
           content::Source<WebDataService>(this),
           content::Details<AutofillChangeList>(&changes));
     }
     return WebDatabase::COMMIT_NEEDED;
   }
   return WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 WebDatabase::State WebDataService::RemoveFormValueForElementNameImpl(
     const string16& name, const string16& value, WebDatabase* db) {
 
-  if (db->GetAutofillTable()->RemoveFormElement(name, value)) {
+  if (AutofillTable::FromWebDatabase(db)->RemoveFormElement(name, value)) {
     AutofillChangeList changes;
     changes.push_back(AutofillChange(AutofillChange::REMOVE,
                                      AutofillKey(name, value)));
 
     // Post the notifications including the list of affected keys.
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
         content::Source<WebDataService>(this),
         content::Details<AutofillChangeList>(&changes));
 
     return WebDatabase::COMMIT_NEEDED;
   }
   return WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 WebDatabase::State WebDataService::AddAutofillProfileImpl(
     const AutofillProfile& profile, WebDatabase* db) {
-  if (!db->GetAutofillTable()->AddAutofillProfile(profile)) {
+  if (!AutofillTable::FromWebDatabase(db)->AddAutofillProfile(profile)) {
     NOTREACHED();
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
 
   // Send GUID-based notification.
   AutofillProfileChange change(AutofillProfileChange::ADD,
                                profile.guid(), &profile);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
       content::Source<WebDataService>(this),
       content::Details<AutofillProfileChange>(&change));
 
   return WebDatabase::COMMIT_NEEDED;
 }
 
 WebDatabase::State WebDataService::UpdateAutofillProfileImpl(
     const AutofillProfile& profile, WebDatabase* db) {
   // Only perform the update if the profile exists.  It is currently
   // valid to try to update a missing profile.  We simply drop the write and
   // the caller will detect this on the next refresh.
   AutofillProfile* original_profile = NULL;
-  if (!db->GetAutofillTable()->GetAutofillProfile(profile.guid(),
+  if (!AutofillTable::FromWebDatabase(db)->GetAutofillProfile(profile.guid(),
       &original_profile)) {
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
   scoped_ptr<AutofillProfile> scoped_profile(original_profile);
 
-  if (!db->GetAutofillTable()->UpdateAutofillProfileMulti(profile)) {
+  if (!AutofillTable::FromWebDatabase(db)->UpdateAutofillProfileMulti(
+          profile)) {
     NOTREACHED();
     return WebDatabase::COMMIT_NEEDED;
   }
 
   // Send GUID-based notification.
   AutofillProfileChange change(AutofillProfileChange::UPDATE,
                                profile.guid(), &profile);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
       content::Source<WebDataService>(this),
       content::Details<AutofillProfileChange>(&change));
 
   return WebDatabase::COMMIT_NEEDED;
 }
 
 WebDatabase::State WebDataService::RemoveAutofillProfileImpl(
     const std::string& guid, WebDatabase* db) {
   AutofillProfile* profile = NULL;
-  if (!db->GetAutofillTable()->GetAutofillProfile(guid, &profile)) {
+  if (!AutofillTable::FromWebDatabase(db)->GetAutofillProfile(guid, &profile)) {
     NOTREACHED();
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
   scoped_ptr<AutofillProfile> scoped_profile(profile);
 
-  if (!db->GetAutofillTable()->RemoveAutofillProfile(guid)) {
+  if (!AutofillTable::FromWebDatabase(db)->RemoveAutofillProfile(guid)) {
     NOTREACHED();
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
 
   // Send GUID-based notification.
   AutofillProfileChange change(AutofillProfileChange::REMOVE, guid, NULL);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
       content::Source<WebDataService>(this),
       content::Details<AutofillProfileChange>(&change));
 
   return WebDatabase::COMMIT_NEEDED;
 }
 
 scoped_ptr<WDTypedResult> WebDataService::GetAutofillProfilesImpl(
     WebDatabase* db) {
   std::vector<AutofillProfile*> profiles;
-  db->GetAutofillTable()->GetAutofillProfiles(&profiles);
+  AutofillTable::FromWebDatabase(db)->GetAutofillProfiles(&profiles);
   return scoped_ptr<WDTypedResult>(
       new WDDestroyableResult<std::vector<AutofillProfile*> >(
           AUTOFILL_PROFILES_RESULT,
           profiles,
           base::Bind(&WebDataService::DestroyAutofillProfileResult,
               base::Unretained(this))));
 }
 
 WebDatabase::State WebDataService::AddCreditCardImpl(
     const CreditCard& credit_card, WebDatabase* db) {
-  if (!db->GetAutofillTable()->AddCreditCard(credit_card)) {
+  if (!AutofillTable::FromWebDatabase(db)->AddCreditCard(credit_card)) {
     NOTREACHED();
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
 
   return WebDatabase::COMMIT_NEEDED;
 }
 
 WebDatabase::State WebDataService::UpdateCreditCardImpl(
     const CreditCard& credit_card, WebDatabase* db) {
   // It is currently valid to try to update a missing profile.  We simply drop
   // the write and the caller will detect this on the next refresh.
   CreditCard* original_credit_card = NULL;
-  if (!db->GetAutofillTable()->GetCreditCard(credit_card.guid(),
+  if (!AutofillTable::FromWebDatabase(db)->GetCreditCard(credit_card.guid(),
       &original_credit_card)) {
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
   scoped_ptr<CreditCard> scoped_credit_card(original_credit_card);
 
-  if (!db->GetAutofillTable()->UpdateCreditCard(credit_card)) {
+  if (!AutofillTable::FromWebDatabase(db)->UpdateCreditCard(credit_card)) {
     NOTREACHED();
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
   return WebDatabase::COMMIT_NEEDED;
 }
 
 WebDatabase::State WebDataService::RemoveCreditCardImpl(
     const std::string& guid, WebDatabase* db) {
-  if (!db->GetAutofillTable()->RemoveCreditCard(guid)) {
+  if (!AutofillTable::FromWebDatabase(db)->RemoveCreditCard(guid)) {
     NOTREACHED();
     return WebDatabase::COMMIT_NOT_NEEDED;
   }
   return WebDatabase::COMMIT_NEEDED;
 }
 
 scoped_ptr<WDTypedResult> WebDataService::GetCreditCardsImpl(WebDatabase* db) {
   std::vector<CreditCard*> credit_cards;
-  db->GetAutofillTable()->GetCreditCards(&credit_cards);
+  AutofillTable::FromWebDatabase(db)->GetCreditCards(&credit_cards);
   return scoped_ptr<WDTypedResult>(
       new WDDestroyableResult<std::vector<CreditCard*> >(
           AUTOFILL_CREDITCARDS_RESULT,
           credit_cards,
           base::Bind(&WebDataService::DestroyAutofillCreditCardResult,
               base::Unretained(this))));
 }
 
 WebDatabase::State
 WebDataService::RemoveAutofillProfilesAndCreditCardsModifiedBetweenImpl(
         const base::Time& delete_begin, const base::Time& delete_end,
         WebDatabase* db) {
   std::vector<std::string> profile_guids;
   std::vector<std::string> credit_card_guids;
-  if (db->GetAutofillTable()->
+  if (AutofillTable::FromWebDatabase(db)->
       RemoveAutofillProfilesAndCreditCardsModifiedBetween(
           delete_begin,
           delete_end,
           &profile_guids,
           &credit_card_guids)) {
     for (std::vector<std::string>::iterator iter = profile_guids.begin();
          iter != profile_guids.end(); ++iter) {
       AutofillProfileChange change(AutofillProfileChange::REMOVE, *iter,
                                    NULL);
       content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
           content::Source<WebDataService>(this),
           content::Details<AutofillProfileChange>(&change));
     }
     // Note: It is the caller's responsibility to post notifications for any
     // changes, e.g. by calling the Refresh() method of PersonalDataManager.
     return WebDatabase::COMMIT_NEEDED;
   }
   return WebDatabase::COMMIT_NOT_NEEDED;
 }
 
-AutofillProfileSyncableService*
-    WebDataService::GetAutofillProfileSyncableService() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  DCHECK(autofill_profile_syncable_service_);  // Make sure we're initialized.
-
-  return autofill_profile_syncable_service_;
-}
-
-AutocompleteSyncableService* WebDataService::GetAutocompleteSyncableService()
-    const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  DCHECK(autocomplete_syncable_service_);  // Make sure we're initialized.
-
-  return autocomplete_syncable_service_;
-}
-
 void WebDataService::DestroyAutofillProfileResult(const WDTypedResult* result) {
   DCHECK(result->GetType() == AUTOFILL_PROFILES_RESULT);
   const WDResult<std::vector<AutofillProfile*> >* r =
       static_cast<const WDResult<std::vector<AutofillProfile*> >*>(result);
   std::vector<AutofillProfile*> profiles = r->GetValue();
   STLDeleteElements(&profiles);
 }
 
 void WebDataService::DestroyAutofillCreditCardResult(
       const WDTypedResult* result) {
   DCHECK(result->GetType() == AUTOFILL_CREDITCARDS_RESULT);
   const WDResult<std::vector<CreditCard*> >* r =
       static_cast<const WDResult<std::vector<CreditCard*> >*>(result);
 
   std::vector<CreditCard*> credit_cards = r->GetValue();
   STLDeleteElements(&credit_cards);
 }