Split Autofill webdata

chrome/browser/webdata/web_data_service_base.cc

Index: chrome/browser/webdata/web_data_service_base.cc
diff --git a/chrome/browser/webdata/web_data_service_base.cc b/chrome/browser/webdata/web_data_service_base.cc
index f9f8f407ba4b681768e9dc1c8fd18ef0844d574b..91998017fae19cb77bb04aa97288b35c5df2410e 100644
--- a/chrome/browser/webdata/web_data_service_base.cc
+++ b/chrome/browser/webdata/web_data_service_base.cc
@@ -29,8 +29,11 @@ using base::Bind;
 using base::Time;
 using content::BrowserThread;
 
-WebDataServiceBase::WebDataServiceBase(const ProfileErrorCallback& callback)
-    : db_loaded_(false),
+WebDataServiceBase::WebDataServiceBase(
+    scoped_refptr<WebDatabaseService> wdbs,
+    const ProfileErrorCallback& callback)
+    : wdbs_(wdbs),
+      db_loaded_(false),
       profile_error_callback_(callback) {
   // WebDataService requires DB thread if instantiated.
   // Set WebDataServiceFactory::GetInstance()->SetTestingFactory(&profile, NULL)
@@ -43,12 +46,10 @@ void WebDataServiceBase::ShutdownOnUIThread() {
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(&WebDataServiceBase::ShutdownOnDBThread, this));
-  ShutdownDatabase();
 }
 
 void WebDataServiceBase::AddTable(scoped_ptr<WebDatabaseTable> table) {
-  if (!wdbs_.get())
-    wdbs_.reset(new WebDatabaseService(path));
+  DCHECK(wdbs_.get());
   wdbs_->AddTable(table.Pass());
 }
 
@@ -97,7 +98,6 @@ base::SupportsUserData* WebDataServiceBase::GetDBUserData() {
 }
 
 WebDataServiceBase::~WebDataServiceBase() {
-  wdbs_.reset();
 }
 
 void WebDataServiceBase::ShutdownOnDBThread() {