Use Observer to notify of WebDB load instead of callbacks

chrome/browser/webdata/web_data_service_factory.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_factory.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
@@ skipping 62 matching lines @@
       scoped_ptr<WebDatabaseTable>(new LoginsTable()));
   web_database_->AddTable(
       scoped_ptr<WebDatabaseTable>(new TokenServiceTable()));
   web_database_->AddTable(
       scoped_ptr<WebDatabaseTable>(new WebAppsTable()));
   // TODO(thakis): Add a migration to delete the SQL table used by
   // WebIntentsTable, then remove this.
   web_database_->AddTable(
       scoped_ptr<WebDatabaseTable>(new WebIntentsTable()));
 
-  // TODO (caitkp): Rework the callbacks here. They're ugly.
-
-  web_database_->LoadDatabase(WebDatabaseService::InitCallback());
+  web_database_->LoadDatabase();
 
   autofill_web_data_ = new AutofillWebDataService(
       web_database_, base::Bind(&ProfileErrorCallback));
   autofill_web_data_->Init();
 
   web_data_ = new WebDataService(
       web_database_, base::Bind(&ProfileErrorCallback));
   web_data_->Init();
 
   BrowserThread::PostTask(
@@ skipping 91 matching lines @@
 }
 
 ProfileKeyedService* WebDataServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   return new WebDataServiceWrapper(static_cast<Profile*>(profile));
 }
 
 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }