Replace WebDatabaseObserver with 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 d49a2f55cf016b7720a81f915e9213400d6b0bb5..3e0074833baa7122663f3c4993224c8170756086 100644
--- a/chrome/browser/sync/glue/autofill_profile_data_type_controller.h
+++ b/chrome/browser/sync/glue/autofill_profile_data_type_controller.h
@@ -10,10 +10,8 @@
 #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/webdata/common/web_database_observer.h"
 
 namespace autofill {
-class AutofillWebDataService;
 class PersonalDataManager;
 }  // namespace autofill
 
@@ -21,7 +19,6 @@ namespace browser_sync {
 
 class AutofillProfileDataTypeController
     : public NonUIDataTypeController,
-      public WebDatabaseObserver,
       public autofill::PersonalDataManagerObserver {
  public:
   AutofillProfileDataTypeController(
@@ -33,9 +30,6 @@ class AutofillProfileDataTypeController
   virtual syncer::ModelType type() const OVERRIDE;
   virtual syncer::ModelSafeGroup model_safe_group() const OVERRIDE;
 
-  // WebDatabaseObserver implementation.
-  virtual void WebDatabaseLoaded() OVERRIDE;
-
   // PersonalDataManagerObserver implementation:
   virtual void OnPersonalDataChanged() OVERRIDE;
 
@@ -50,8 +44,11 @@ class AutofillProfileDataTypeController
   virtual void StopModels() OVERRIDE;
 
  private:
+  // Callback to notify that WebDatabase has loaded.
+  void WebDatabaseLoaded();
+
   autofill::PersonalDataManager* personal_data_;
-  scoped_refptr<autofill::AutofillWebDataService> web_data_service_;
+  bool callback_registered_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillProfileDataTypeController);
 };