Migrate AutofillProfile sync to new API.

chrome/browser/sync/glue/autofill_profile_syncable_service.h

Index: chrome/browser/sync/glue/autofill_profile_syncable_service.h
===================================================================
--- chrome/browser/sync/glue/autofill_profile_syncable_service.h	(revision 0)
+++ chrome/browser/sync/glue/autofill_profile_syncable_service.h	(revision 0)
@@ -0,0 +1,164 @@
+// 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_SYNC_GLUE_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_

[tim (not reviewing), 2011/09/12 17:40:54]

We should move this (and related syncable service impl code) to the autofill
directory, not sync/glue.

[GeorgeY, 2011/09/12 18:28:34]

 Will do this in the separate cl, when changing the rest of the AutofillSyncs.

+#define CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
+#pragma once
+
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+
+#include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
+#include "base/synchronization/lock.h"
+#include "base/threading/non_thread_safe.h"
+#include "chrome/browser/autofill/personal_data_manager.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 {
+
+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,
+                                 PersonalDataManager* data_manager,
+                                 Profile* profile);
+  virtual ~AutofillProfileSyncableService();
+
+  static syncable::ModelType model_type() { return syncable::AUTOFILL_PROFILE; }
+
+  // SyncableService implementation.
+  virtual SyncError MergeDataAndStartSyncing(
+      syncable::ModelType type,
+      const SyncDataList& initial_sync_data,
+      SyncChangeProcessor* sync_processor) OVERRIDE;
+  virtual void StopSyncing(syncable::ModelType type) OVERRIDE;
+  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;
+
+ 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 MockAutofillProfileSyncableService;
+  FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
+                           MergeDataAndStartSyncing);
+  FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest, GetAllSyncData);
+  FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
+                           ProcessSyncChanges);
+
+  // The map of the guid to profiles owned by the |profiles_| vector.
+  typedef std::map<std::string, AutofillProfile*> GUIDToProfileMap;
+
+  // Helper function that overwrites |profile| with data from proto-buffer
+  // |specifics|.
+  static bool OverwriteProfileWithServerData(
+      const sync_pb::AutofillProfileSpecifics& specifics,
+      AutofillProfile* profile);
+
+  // Writes |profile| data into supplied |profile_specifics|.
+  static void WriteAutofillProfile(const AutofillProfile& profile,
+                                   sync_pb::EntitySpecifics* profile_specifics);
+
+  // Creates |profile_map| from the supplied |profiles| vector. Necessary for
+  // fast processing of the changes.
+  void CreateGUIDToProfileMap(const std::vector<AutofillProfile*>& profiles,
+                              GUIDToProfileMap* profile_map);
+
+  // Creates or updates a profile based on |data|. Looks at the guid of the data
+  // and if a profile with such guid is present in |profile_map| updates it. If
+  // not, searches through it for similar profiles. If similar profile is
+  // found substitutes it for the new one, otherwise adds a new profile. Returns
+  // iterator pointing to added/updated profile.
+  GUIDToProfileMap::iterator CreateOrUpdateProfile(
+      const SyncData& data, GUIDToProfileMap* profile_map, DataBundle* bundle);
+
+  // Syncs |change| to the cloud.
+  void ActOnChange(const AutofillProfileChange& change);
+
+  // Creates SyncData based on supplied |profile|.
+  static SyncData CreateData(const AutofillProfile& profile);
+
+  // For unit-tests.
+  AutofillProfileSyncableService();
+  void set_sync_processor(SyncChangeProcessor* sync_processor) {
+    sync_processor_ = sync_processor;
+  }
+
+  WebDatabase* web_database_;
+  PersonalDataManager* personal_data_;

[tim (not reviewing), 2011/09/12 18:29:23]

Also, why didn't we make the PDM the syncable service, since it's the actual
data service?

[GeorgeY, 2011/09/12 22:26:39]

Want to re-use this service for autocomplete as well (which uses almost the same
protobufs and so almost the same Specifics on the back-end)

+  NotificationRegistrar notification_registrar_;
+
+  // Cached Autofill profiles. *Warning* deleted profiles are still in the
+  // vector - use the |profiles_map_| to iterate through actual profiles.
+  ScopedVector<AutofillProfile> profiles_;

[lipalani1, 2011/09/08 23:53:01]

I dont think this is needed. This just takes up extra memory.

[GeorgeY, 2011/09/09 19:43:12]

It is much cleaner this way, and the memory overhead is small (how many items
are going to be deleted during one Chrome session? 5? 10? Probably less, and
each is smaller than 1Kb on average). So the overhead would be 5-10 Kb, for the
convenience of clear object responsible for lifetime of the Profiles.

+  GUIDToProfileMap profiles_map_;

[lipalani1, 2011/09/08 23:52:02]

I dont think this is needed. This just takes up extra memory.

[lipalani1, 2011/09/08 23:53:01]

sorry did not mean here. Ignore this.
On 2011/09/08 23:52:02, lipalani1 wrote:

+
+  SyncChangeProcessor* sync_processor_;
+
+  DISALLOW_COPY_AND_ASSIGN(AutofillProfileSyncableService);
+};
+
+// 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_SYNC_GLUE_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
+
Property changes on: chrome\browser\sync\glue\autofill_profile_syncable_service.h
___________________________________________________________________
Added: svn:eol-style
   + LF