Rest of the autofill work.

chrome/browser/sync/glue/autofill_model_associator.h

 // Copyright (c) 2010 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_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_AUTOFILL_MODEL_ASSOCIATOR_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/lock.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/autofill_model_associator2.h"
 #include "chrome/browser/sync/glue/model_associator.h"
+#include "chrome/browser/sync/syncable/syncable.h"

[tim (not reviewing), 2010/12/13 19:24:33]

illegal include

[lipalani, 2010/12/15 09:08:33]

Done.

 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 
 class AutoFillProfile;
 
 class ProfileSyncService;
 class WebDatabase;
 
 namespace sync_api {
 class WriteTransaction;
@@ skipping 14 matching lines @@
 // merge and sync.
 class AutofillModelAssociator
     : public PerDataTypeAssociatorInterface<std::string, std::string> {
  public:
   static syncable::ModelType model_type() { return syncable::AUTOFILL; }
   AutofillModelAssociator(ProfileSyncService* sync_service,
                           WebDatabase* web_database,
                           PersonalDataManager* data_manager);
   virtual ~AutofillModelAssociator();
 
-  // A task used by this class and the change processor to inform the
-  // PersonalDataManager living on the UI thread that it needs to refresh.
-  class DoOptimisticRefreshTask : public Task {
-   public:
-    explicit DoOptimisticRefreshTask(PersonalDataManager* pdm);
-    virtual ~DoOptimisticRefreshTask();
-    virtual void Run();
-   private:
-    scoped_refptr<PersonalDataManager> pdm_;
-  };
-
   // PerDataTypeAssociatorInterface implementation.
   //
   // Iterates through the sync model looking for matched pairs of items.
   virtual bool AssociateModels();
 
   // Clears all associations.
   virtual bool DisassociateModels();
 
   // The has_nodes out param is true if the sync model has nodes other
   // than the permanent tagged nodes.
@@ skipping 31 matching lines @@
   static bool FillProfileWithServerData(
       AutoFillProfile* merge_into,
       const sync_pb::AutofillProfileSpecifics& specifics);
 
   // TODO(georgey) : add the same processing for CC info (already in protocol
   // buffers).
 
   // Returns sync service instance.
   ProfileSyncService* sync_service() { return sync_service_; }
 
- protected:
   // Is called to determine if we need to upgrade to the new
   // autofillprofile2 data type. If so we need to sync up autofillprofile
   // first to the latest available changes on the server and then upgrade
   // to autofillprofile2.
-  virtual bool HasNotMigratedYet();
+  virtual bool HasNotMigratedYet(const sync_api::BaseTransaction* trans);
 
+ protected:
   // Given a profile from sync db it tries to match the profile against
   // one in web db. it ignores the guid and compares the actual data.
   AutoFillProfile* FindCorrespondingNodeFromWebDB(
       const sync_pb::AutofillProfileSpecifics& profile,
       const std::vector<AutoFillProfile*>& all_profiles_from_db);
 
  private:
   typedef std::map<std::string, int64> AutofillToSyncIdMap;
   typedef std::map<int64, std::string> SyncIdToAutofillMap;
 
@@ skipping 39 matching lines @@
                               const sync_api::ReadNode& node);
 
   // Helper to insert an AutoFillProfile into the WebDatabase (e.g. in response
   // to encountering a sync node that doesn't exist yet locally).
   void AddNativeProfileIfNeeded(
       const sync_pb::AutofillProfileSpecifics& profile,
       DataBundle* bundle,
       const sync_api::ReadNode& node,
       const std::vector<AutoFillProfile*>& all_profiles_from_db);
 
-  // Helper to insert a sync node for the given AutoFillProfile (e.g. in
-  // response to encountering a native profile that doesn't exist yet in the
-  // cloud).
-  bool MakeNewAutofillProfileSyncNode(
-      sync_api::WriteTransaction* trans,
-      const sync_api::BaseNode& autofill_root,
-      const std::string& tag,
-      const AutoFillProfile& profile,
-      int64* sync_id);
-
   // Called at various points in model association to determine if the
   // user requested an abort.
   bool IsAbortPending();
 
+  bool MigrationLoggingEnabled();
+
   ProfileSyncService* sync_service_;
   WebDatabase* web_database_;
   PersonalDataManager* personal_data_;
   int64 autofill_node_id_;
 
   AutofillToSyncIdMap id_map_;
   SyncIdToAutofillMap id_map_inverse_;
 
   // Abort association pending flag and lock.  If this is set to true
   // (via the AbortAssociation method), return from the
   // AssociateModels method as soon as possible.
   Lock abort_association_pending_lock_;
   bool abort_association_pending_;
+  int number_of_entries_created_;
+
+  syncable::AutofillMigrationState

[tim (not reviewing), 2010/12/13 19:24:33]

shouldn't this be in the autofill_migration.h?

[lipalani, 2010/12/15 09:08:33]

removed.
On 2010/12/13 19:24:33, timsteele wrote:

+      autofill_migration_state_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_AUTOFILL_MODEL_ASSOCIATOR_H_