Use Observer to notify of WebDB load instead of callbacks

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 16 matching lines @@
                                        const ProfileErrorCallback& callback)
     : 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::WebDatabaseLoaded() {
+  db_loaded_ = true;
+}
+
+void WebDataServiceBase::WebDatabaseLoadFailed(sql::InitStatus status) {
+  if (!profile_error_callback_.is_null()) {

[dhollowa, 2013/04/18 16:21:17]

nit: no {} needed

[Cait (Slow), 2013/04/19 19:06:22]

Done.

+    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_->LoadDatabase(Bind(&WebDataServiceBase::DatabaseInitOnDB, this));
+  wdbs_->AddObserver(this);
+  wdbs_->LoadDatabase();
 }
 
 void WebDataServiceBase::UnloadDatabase() {
   if (!wdbs_)
     return;
   wdbs_->UnloadDatabase();
 }
 
 void WebDataServiceBase::ShutdownDatabase() {
   if (!wdbs_)
     return;
   wdbs_->ShutdownDatabase();
 }
 
 void WebDataServiceBase::CancelRequest(Handle h) {
   if (!wdbs_)
     return;
   wdbs_->CancelRequest(h);
 }
 
 content::NotificationSource WebDataServiceBase::GetNotificationSource() {
   return content::Source<WebDataServiceBase>(this);
 }
 
 bool WebDataServiceBase::IsDatabaseLoaded() {
   return db_loaded_;
 }
 
+void WebDataServiceBase::AddDBObserver(WebDatabaseObserver* observer) {
+  if (!wdbs_)
+    return;
+  wdbs_->AddObserver(observer);
+}
+
+void WebDataServiceBase::RemoveDBObserver(WebDatabaseObserver* observer) {
+  if (!wdbs_)
+    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() {
   DCHECK(!db_thread_user_data_.get()) << "Forgot to call ShutdownOnUIThread?";
 }
 
 void WebDataServiceBase::ShutdownOnDBThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   db_thread_user_data_.reset();
 }
-
-void WebDataServiceBase::NotifyDatabaseLoadedOnUIThread() {}
-
-void WebDataServiceBase::DBInitFailed(sql::InitStatus sql_status) {
-  if (!profile_error_callback_.is_null())
-    profile_error_callback_.Run(sql_status);
-}
-
-void WebDataServiceBase::DBInitSucceeded() {
-  db_loaded_ = true;
-  NotifyDatabaseLoadedOnUIThread();
-}
-
-// Executed on DB thread.
-void WebDataServiceBase::DatabaseInitOnDB(sql::InitStatus status) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  if (status == sql::INIT_OK) {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&WebDataServiceBase::DBInitSucceeded, this));
-  } else {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&WebDataServiceBase::DBInitFailed, this, status));
-  }
-}