The AutofillProfileSyncableService's lifetime should be managed by the WebDataService

chrome/browser/webdata/autofill_profile_syncable_service.h

Index: chrome/browser/webdata/autofill_profile_syncable_service.h
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.h b/chrome/browser/webdata/autofill_profile_syncable_service.h
index 74397b98cffb1316f0e8e4d87cce109aac01faf9..765ab89aaefefd8f0ae9390060c21895a433aef3 100644
--- a/chrome/browser/webdata/autofill_profile_syncable_service.h
+++ b/chrome/browser/webdata/autofill_profile_syncable_service.h
@@ -27,15 +27,14 @@
 class AutofillProfile;
 class Profile;
 class ProfileSyncServiceAutofillTest;
-
 class WebDatabase;
 
 namespace browser_sync {
+class UnrecoverableErrorHandler;
+}
 
 extern const char kAutofillProfileTag[];
 
-class UnrecoverableErrorHandler;
-
 // The sync implementation for AutofillProfiles.
 // MergeDataAndStartSyncing() called first, it does cloud->local and
 // local->cloud syncs. Then for each cloud change we receive
@@ -66,6 +65,9 @@ class AutofillProfileSyncableService
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
+  const WebDatabase* web_database() { return web_database_; }

[akalin, 2011/10/10 21:58:57]

where are these used?

[Ilya Sherman, 2011/10/10 22:33:13]

I added them for the sake of the DCHECK's in the autofill_table code.

+  const Profile* profile() { return profile_; }
+
  protected:
   // A convenience wrapper of a bunch of state we pass around while
   // associating models, and send to the WebDatabase for persistence.
@@ -84,7 +86,7 @@ class AutofillProfileSyncableService
   virtual bool SaveChangesToWebData(const DataBundle& bundle);
 
  private:
-  friend class ::ProfileSyncServiceAutofillTest;
+  friend class ProfileSyncServiceAutofillTest;
   friend class MockAutofillProfileSyncableService;
   FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
                            MergeDataAndStartSyncing);
@@ -156,6 +158,4 @@ struct AutofillProfileSyncableService::DataBundle {
   std::vector<AutofillProfile*> profiles_to_add;
 };
 
-}  // namespace browser_sync
-
 #endif  // CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_