Split Autofill webdata

chrome/browser/webdata/web_data_service_factory.cc

Index: chrome/browser/webdata/web_data_service_factory.cc
diff --git a/chrome/browser/webdata/web_data_service_factory.cc b/chrome/browser/webdata/web_data_service_factory.cc
index 0dcb1e100d2dd197f4835e9e37dfa1469088d19a..2cac446c8be20cff92b15225f976e668e0e9d031 100644
--- a/chrome/browser/webdata/web_data_service_factory.cc
+++ b/chrome/browser/webdata/web_data_service_factory.cc
@@ -4,18 +4,62 @@
 
 #include "chrome/browser/webdata/web_data_service_factory.h"
 
+#include "base/bind.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
+#include "chrome/browser/ui/profile_error_dialog.h"
+#include "chrome/browser/webdata/autocomplete_syncable_service.h"
+#include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/browser/webdata/autofill_web_data_service_impl.h"
 #include "chrome/common/chrome_constants.h"
+#include "content/public/browser/browser_thread.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+
+using content::BrowserThread;
+
+namespace {
+
+// Callback to show error dialog on profile load error.
+void ProfileErrorCallback(sql::InitStatus status) {
+  ShowProfileErrorDialog(
+      (status == sql::INIT_FAILURE) ?
+      IDS_COULDNT_OPEN_PROFILE_ERROR : IDS_PROFILE_TOO_NEW_ERROR);
+}
+
+void InitSyncableServicesOnDBThread(scoped_refptr<WebDataService> web_data) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+
+  // Currently only Autocomplete and Autofill profiles use the new Sync API, but
+  // all the database data should migrate to this API over time.
+  AutocompleteSyncableService::CreateForWebDataService(web_data);
+  AutofillProfileSyncableService::CreateForWebDataService(web_data);
+}
+
+}  // namespace
 
 WebDataServiceWrapper::WebDataServiceWrapper() {}
 
 WebDataServiceWrapper::WebDataServiceWrapper(Profile* profile){
   base::FilePath path = profile->GetPath();
   path = path.Append(chrome::kWebDataFilename);
-  web_data_service_ = new WebDataService();
+
+  // TODO (caitkp): Rework the callbacks here. They're ugly.
+
+  web_database_ = new WebDatabaseService(path);
+  web_database_->LoadDatabase(WebDatabaseService::InitCallback());
+
+  web_data_service_ = new WebDataService(
+      web_database_, base::Bind(&ProfileErrorCallback));
   web_data_service_->Init(path);
+
+  autofill_web_data_ = new AutofillWebDataServiceImpl(
+      web_database_, base::Bind(&ProfileErrorCallback));
+  autofill_web_data_->Init(path);
+
+  BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
+                          base::Bind(&InitSyncableServicesOnDBThread,
+                                     web_data_service_));
 }
 
 WebDataServiceWrapper::~WebDataServiceWrapper() {
@@ -23,6 +67,8 @@ WebDataServiceWrapper::~WebDataServiceWrapper() {
 
 void WebDataServiceWrapper::Shutdown() {
   web_data_service_->ShutdownOnUIThread();
+  //autofill_web_data_->ShutdownOnUIThread();
+  web_database_->ShutdownDatabase();
   web_data_service_ = NULL;
 }
 
@@ -30,21 +76,24 @@ scoped_refptr<WebDataService> WebDataServiceWrapper::GetWebData() {
   return web_data_service_.get();
 }
 
+scoped_refptr<AutofillWebDataService>
+WebDataServiceWrapper::GetAutofillWebData() {
+  return autofill_web_data_.get();
+}
+
 // static
 scoped_refptr<AutofillWebDataService>
 AutofillWebDataService::FromBrowserContext(content::BrowserContext* context) {
   // For this service, the implicit/explicit distinction doesn't
   // really matter; it's just used for a DCHECK.  So we currently
   // cheat and always say EXPLICIT_ACCESS.
-  scoped_refptr<WebDataService> service = WebDataServiceFactory::GetForProfile(
-      static_cast<Profile*>(context), Profile::EXPLICIT_ACCESS);
-
-  if (service.get()) {
-    return scoped_refptr<AutofillWebDataService>(
-        new AutofillWebDataServiceImpl(service));
-  } else {
-    return scoped_refptr<AutofillWebDataService>(NULL);
-  }
+  WebDataServiceWrapper* wrapper =
+      WebDataServiceFactory::GetWrapper(
+          static_cast<Profile*>(context), Profile::EXPLICIT_ACCESS);
+  if (wrapper)
+    return wrapper->GetAutofillWebData();
+  // |wrapper| can be NULL in Incognito mode.
+  return scoped_refptr<AutofillWebDataService>(NULL);;
 }
 
 // static
@@ -67,6 +116,17 @@ WebDataServiceFactory::WebDataServiceFactory()
 WebDataServiceFactory::~WebDataServiceFactory() {}
 
 // static
+WebDataServiceWrapper* WebDataServiceFactory::GetWrapper(
+    Profile* profile, Profile::ServiceAccessType access_type) {
+  // If |access_type| starts being used for anything other than this
+  // DCHECK, we need to start taking it as a parameter to
+  // AutofillWebDataServiceImpl::FromBrowserContext (see above).
+  DCHECK(access_type != Profile::IMPLICIT_ACCESS || !profile->IsOffTheRecord());
+  return static_cast<WebDataServiceWrapper*>(
+          GetInstance()->GetServiceForProfile(profile, true));
+}
+
+// static
 scoped_refptr<WebDataService> WebDataServiceFactory::GetForProfile(
     Profile* profile, Profile::ServiceAccessType access_type) {
   // If |access_type| starts being used for anything other than this