Move SupportsUserData code into AutofillWebData

components/autofill/browser/webdata/autofill_webdata_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 "components/autofill/browser/webdata/autofill_webdata_service.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
@@ skipping 29 matching lines @@
     scoped_refptr<WebDatabaseService> wdbs,
     const ProfileErrorCallback& callback)
     : WebDataServiceBase(wdbs, callback)  {
 }
 
 AutofillWebDataService::AutofillWebDataService()
     : WebDataServiceBase(NULL,
                          WebDataServiceBase::ProfileErrorCallback()) {
 }
 
+void AutofillWebDataService::ShutdownOnUIThread() {
+  BrowserThread::PostTask(
+    BrowserThread::DB, FROM_HERE,
+    base::Bind(&AutofillWebDataService::ShutdownOnDBThread, this));
+  WebDataServiceBase::ShutdownOnUIThread();
+}
+
 void AutofillWebDataService::AddFormFields(
     const std::vector<FormFieldData>& fields) {
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&AutofillWebDataService::AddFormElementsImpl, this, fields));
 }
 
 WebDataServiceBase::Handle AutofillWebDataService::GetFormValuesForElementName(
     const base::string16& name, const base::string16& prefix, int limit,
     WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
@@ skipping 97 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ui_observer_list_.AddObserver(observer);
 }
 
 void AutofillWebDataService::RemoveObserver(
     AutofillWebDataServiceObserverOnUIThread* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ui_observer_list_.RemoveObserver(observer);
 }
 
-AutofillWebDataService::~AutofillWebDataService() {}
+base::SupportsUserData* AutofillWebDataService::GetDBUserData() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+  if (!db_thread_user_data_)
+    db_thread_user_data_.reset(new SupportsUserDataAggregatable());
+  return db_thread_user_data_.get();
+}
+
+void AutofillWebDataService::ShutdownOnDBThread() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+  db_thread_user_data_.reset();
+}
+
+AutofillWebDataService::~AutofillWebDataService() {
+   DCHECK(!db_thread_user_data_.get()) << "Forgot to call ShutdownOnUIThread?";
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Autofill implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 WebDatabase::State AutofillWebDataService::AddFormElementsImpl(
     const std::vector<FormFieldData>& fields, WebDatabase* db) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
@@ skipping 270 matching lines @@
 }
 
 void AutofillWebDataService::NotifyAutofillMultipleChangedOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(AutofillWebDataServiceObserverOnUIThread,
                     ui_observer_list_,
                     AutofillMultipleChanged());
 }
 
 }  // namespace autofill