Move SupportsUserData code into AutofillWebData

components/webdata/common/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 "components/webdata/common/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 27 matching lines @@
   db_loaded_ = true;
 }
 
 void WebDataServiceBase::WebDatabaseLoadFailed(sql::InitStatus status) {
   if (!profile_error_callback_.is_null())
     profile_error_callback_.Run(status);
 }
 
 void WebDataServiceBase::ShutdownOnUIThread() {
   db_loaded_ = false;
-  BrowserThread::PostTask(
-      BrowserThread::DB, FROM_HERE,
-      base::Bind(&WebDataServiceBase::ShutdownOnDBThread, this));
 }
 
 void WebDataServiceBase::Init() {
   DCHECK(wdbs_.get());
   wdbs_->AddObserver(this);
   wdbs_->LoadDatabase();
 }
 
 void WebDataServiceBase::UnloadDatabase() {
   if (!wdbs_)
@@ skipping 32 matching lines @@
     return;
   wdbs_->RemoveObserver(observer);
 }
 
 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() {
 }
-
-WebDataServiceBase::~WebDataServiceBase() {
-  DCHECK(!db_thread_user_data_.get()) << "Forgot to call ShutdownOnUIThread?";
-}
-
-void WebDataServiceBase::ShutdownOnDBThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  db_thread_user_data_.reset();
-}