Remove knowledge of Chrome-specific SyncableService classes from WebDataService.

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"
@@ skipping 22 matching lines @@
     : 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::Init(const base::FilePath& path) {
   wdbs_.reset(new WebDatabaseService(path));
   wdbs_->LoadDatabase(Bind(&WebDataServiceBase::DatabaseInitOnDB, this));
 }
 
 void WebDataServiceBase::UnloadDatabase() {
   if (!wdbs_)
@@ skipping 20 matching lines @@
 bool WebDataServiceBase::IsDatabaseLoaded() {
   return db_loaded_;
 }
 
 WebDatabase* WebDataServiceBase::GetDatabase() {
   if (!wdbs_)
     return NULL;
   return wdbs_->GetDatabaseOnDB();
 }
 
+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() {
   wdbs_.reset();
 }
 
+void WebDataServiceBase::ShutdownOnDBThread() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+  db_thread_user_data_.reset();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // The following methods are executed on the DB thread.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 void WebDataServiceBase::DBInitFailed(sql::InitStatus sql_status) {
   if (!profile_error_callback_.is_null())
     profile_error_callback_.Run(sql_status);
 }
@@ skipping 13 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));
   }
 }