The AutofillProfileSyncableService's lifetime should be managed by the WebDataService

chrome/browser/webdata/autofill_profile_syncable_service.h

 // Copyright (c) 2011 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.
 #ifndef CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
 #define CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/sync/api/sync_change.h"
 #include "chrome/browser/sync/api/sync_data.h"
 #include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/api/syncable_service.h"
 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "content/common/content_notification_types.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
 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
 // ProcessSyncChanges() and for each local change Observe() is called.
 class AutofillProfileSyncableService
     : public SyncableService,
       public NotificationObserver,
       public base::NonThreadSafe {
  public:
   AutofillProfileSyncableService(WebDatabase* web_database, Profile* profile);
@@ skipping 10 matching lines @@
   virtual SyncDataList GetAllSyncData(syncable::ModelType type) const OVERRIDE;
   virtual SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const SyncChangeList& change_list) OVERRIDE;
 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        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.
   // We do this so we hold the write lock for only a small period.
   // When storing the web db we are out of the write lock.
   struct DataBundle;
 
   // Helper to query WebDatabase for the current autofill state.
   // Made virtual for ease of mocking in the unit-test.
   // Caller owns returned |profiles|.
   virtual bool LoadAutofillData(std::vector<AutofillProfile*>* profiles);
 
   // Helper to persist any changes that occured during model association to
   // the WebDatabase.
   // Made virtual for ease of mocking in the unit-test.
   virtual bool SaveChangesToWebData(const DataBundle& bundle);
 
  private:
-  friend class ::ProfileSyncServiceAutofillTest;
+  friend class ProfileSyncServiceAutofillTest;
   friend class MockAutofillProfileSyncableService;
   FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
                            MergeDataAndStartSyncing);
   FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest, GetAllSyncData);
   FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
                            ProcessSyncChanges);
   FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
                            ActOnChange);
 
   // The map of the guid to profiles owned by the |profiles_| vector.
@@ skipping 51 matching lines @@
 // This object is used in unit-tests as well, so it defined here.
 struct AutofillProfileSyncableService::DataBundle {
   DataBundle();
   ~DataBundle();
 
   std::vector<std::string> profiles_to_delete;
   std::vector<AutofillProfile*> profiles_to_update;
   std::vector<AutofillProfile*> profiles_to_add;
 };
 
-}  // namespace browser_sync
-
 #endif  // CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_