Split Autofill webdata

chrome/browser/webdata/web_data_service_base.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/api/webdata/web_data_service_base.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/webdata/web_database_service.h"
 #include "chrome/common/chrome_notification_types.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"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataServiceBase implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 using base::Bind;
 using base::Time;
 using content::BrowserThread;
 
-WebDataServiceBase::WebDataServiceBase(const base::FilePath& path,
+WebDataServiceBase::WebDataServiceBase(scoped_refptr<WebDatabaseService> wdbs,
                                        const ProfileErrorCallback& callback)
-    : db_loaded_(false),
-      path_(path),
+    : wdbs_(wdbs),
+      db_loaded_(false),
       profile_error_callback_(callback) {
   // 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));
 }
 
 void WebDataServiceBase::ShutdownOnUIThread() {
   db_loaded_ = false;
   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());
 }
 
 void WebDataServiceBase::Init() {
   DCHECK(wdbs_.get());
   wdbs_->LoadDatabase(Bind(&WebDataServiceBase::DatabaseInitOnDB, this));
 }
 
 void WebDataServiceBase::UnloadDatabase() {
   if (!wdbs_)
@@ skipping 29 matching lines @@
 
 base::SupportsUserData* WebDataServiceBase::GetDBUserData() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   if (!db_thread_user_data_)
     db_thread_user_data_.reset(new SupportsUserDataAggregatable());
   return db_thread_user_data_.get();
 }
 
 WebDataServiceBase::~WebDataServiceBase() {
   DCHECK(!db_thread_user_data_.get()) << "Forgot to call ShutdownOnUIThread?";
-  wdbs_.reset();
 }
 
 void WebDataServiceBase::ShutdownOnDBThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   db_thread_user_data_.reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // The following methods are executed on the DB thread.
@@ skipping 20 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&WebDataServiceBase::NotifyDatabaseLoadedOnUIThread, this));
   } else {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&WebDataServiceBase::DBInitFailed, this, status));
   }
 }