Introduce a couple of abstract bases for WebDataService.

chrome/browser/webdata/web_data_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 "chrome/browser/webdata/web_data_service.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
@@ skipping 43 matching lines @@
 namespace {
 
 // A task used by WebDataService (for Sync mainly) to inform the
 // PersonalDataManager living on the UI thread that it needs to refresh.
 void NotifyOfMultipleAutofillChangesTask(
     const scoped_refptr<WebDataService>& web_data_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_AUTOFILL_MULTIPLE_CHANGED,
-      content::Source<WebDataService>(web_data_service.get()),
+      content::Source<WebDataServiceBase>(web_data_service.get()),
       content::NotificationService::NoDetails());
 }
 
 }  // namespace
 
 WDAppImagesResult::WDAppImagesResult() : has_all_images(false) {}
 
 WDAppImagesResult::~WDAppImagesResult() {}
 
 WDKeywordsResult::WDKeywordsResult()
   : default_search_provider_id(0),
     builtin_keyword_version(0),
     backup_valid(false),
     did_default_search_provider_change(false) {
 }
 
 WDKeywordsResult::~WDKeywordsResult() {}
 
 WebDataService::WebDataService()
-    : RefcountedProfileKeyedService(BrowserThread::UI),
-      is_running_(false),
+    : is_running_(false),
       db_(NULL),
       autocomplete_syncable_service_(NULL),
       autofill_profile_syncable_service_(NULL),
       failed_init_(false),
       should_commit_(false),
       next_request_handle_(1),
       main_loop_(MessageLoop::current()) {
   // WebDataService requires DB thread if instantiated.
   // Set WebDataServiceFactory::GetInstance()->SetTestingFactory(&profile, NULL)
   // if you do not want to instantiate WebDataService in your test.
@@ skipping 37 matching lines @@
 void WebDataService::CancelRequest(Handle h) {
   base::AutoLock l(pending_lock_);
   RequestMap::iterator i = pending_requests_.find(h);
   if (i == pending_requests_.end()) {
     NOTREACHED() << "Canceling a nonexistent web data service request";
     return;
   }
   i->second->Cancel();
 }
 
+content::NotificationSource WebDataService::GetNotificationSource() {
+  return content::Source<WebDataService>(this);
+}
+
 bool WebDataService::IsDatabaseLoaded() {
   return db_ != NULL;
 }
 
 WebDatabase* WebDataService::GetDatabase() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   return db_;
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ skipping 1359 matching lines @@
 }
 
 const WDTypedResult* WebDataService::WebDataRequest::GetResult() const {
   return result_;
 }
 
 void WebDataService::WebDataRequest::RequestComplete() {
   message_loop_->PostTask(FROM_HERE, Bind(&WebDataService::RequestCompleted,
                                           service_.get(), handle_));
 }