Use Observer to notify of WebDB load instead of callbacks

chrome/browser/sync/glue/autofill_profile_data_type_controller.h

Index: chrome/browser/sync/glue/autofill_profile_data_type_controller.h
diff --git a/chrome/browser/sync/glue/autofill_profile_data_type_controller.h b/chrome/browser/sync/glue/autofill_profile_data_type_controller.h
index 3d4fa57cbbe50bc11e2cc2143780f70f004cd853..d49a2f55cf016b7720a81f915e9213400d6b0bb5 100644
--- a/chrome/browser/sync/glue/autofill_profile_data_type_controller.h
+++ b/chrome/browser/sync/glue/autofill_profile_data_type_controller.h
@@ -10,7 +10,7 @@
 #include "base/scoped_observer.h"
 #include "chrome/browser/sync/glue/non_ui_data_type_controller.h"
 #include "components/autofill/browser/personal_data_manager_observer.h"
-#include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
+#include "components/webdata/common/web_database_observer.h"
 
 namespace autofill {
 class AutofillWebDataService;
@@ -21,7 +21,7 @@ namespace browser_sync {
 
 class AutofillProfileDataTypeController
     : public NonUIDataTypeController,
-      public autofill::AutofillWebDataServiceObserverOnUIThread,
+      public WebDatabaseObserver,
       public autofill::PersonalDataManagerObserver {
  public:
   AutofillProfileDataTypeController(
@@ -33,7 +33,7 @@ class AutofillProfileDataTypeController
   virtual syncer::ModelType type() const OVERRIDE;
   virtual syncer::ModelSafeGroup model_safe_group() const OVERRIDE;
 
-  // AutofillWebDataServiceObserverOnUIThread implementation.
+  // WebDatabaseObserver implementation.
   virtual void WebDatabaseLoaded() OVERRIDE;
 
   // PersonalDataManagerObserver implementation:
@@ -52,8 +52,6 @@ class AutofillProfileDataTypeController
  private:
   autofill::PersonalDataManager* personal_data_;
   scoped_refptr<autofill::AutofillWebDataService> web_data_service_;
-  ScopedObserver<autofill::AutofillWebDataService,
-                 AutofillProfileDataTypeController> scoped_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillProfileDataTypeController);
 };