Rest of the autofill work.

chrome/browser/sync/glue/autofill_profile_model_associator.h

Index: chrome/browser/sync/glue/autofill_profile_model_associator.h
diff --git a/chrome/browser/sync/glue/autofill_profile_model_associator.h b/chrome/browser/sync/glue/autofill_profile_model_associator.h
index ad8af5c304a832e9022e95e5aebbad515f7efa48..ee34ce7ab1435d7b96f3c7eea63736aa8496d645 100644
--- a/chrome/browser/sync/glue/autofill_profile_model_associator.h
+++ b/chrome/browser/sync/glue/autofill_profile_model_associator.h
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

[tim (not reviewing), 2010/12/15 20:11:42]

nit - extra newline

[lipalani, 2010/12/15 21:28:15]

Done.

+
 #ifndef CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_MODEL_ASSOCIATOR_H_
 #pragma once
@@ -31,6 +32,8 @@ class WriteTransaction;
 
 namespace browser_sync {
 
+extern const char kAutofillProfileTag[];
+
 class AutofillChangeProcessor;
 class UnrecoverableErrorHandler;
 
@@ -94,6 +97,10 @@ class AutofillProfileModelAssociator
   // Returns sync service instance.
   ProfileSyncService* sync_service() { return sync_service_; }
 
+  static bool OverwriteProfileWithServerData(
+      AutoFillProfile* merge_into,
+      const sync_pb::AutofillProfileSpecifics& specifics);
+
  protected:
   AutofillProfileModelAssociator();
   bool TraverseAndAssociateChromeAutoFillProfiles(
@@ -105,6 +112,7 @@ class AutofillProfileModelAssociator
       std::vector<AutoFillProfile*>* new_profiles,
       std::vector<std::string>* profiles_to_delete);
 

[tim (not reviewing), 2010/12/15 20:11:42]

nit - extra newline.

[lipalani, 2010/12/15 21:28:15]

Done.

+
   // Helper to insert an AutoFillProfile into the WebDatabase (e.g. in response
   // to encountering a sync node that doesn't exist yet locally).
   virtual void AddNativeProfileIfNeeded(
@@ -130,10 +138,6 @@ class AutofillProfileModelAssociator
       const sync_api::ReadNode& autofill_root,
       DataBundle* bundle);
 
-  static bool OverwriteProfileWithServerData(
-      AutoFillProfile* merge_into,
-      const sync_pb::AutofillProfileSpecifics& specifics);
-
  private:
   typedef std::map<std::string, int64> AutofillToSyncIdMap;
   typedef std::map<int64, std::string> SyncIdToAutofillMap;
@@ -161,6 +165,8 @@ class AutofillProfileModelAssociator
       const sync_api::BaseNode& autofill_root,
       const AutoFillProfile& profile);
 
+  bool MigrationLoggingEnabled();
+
   ProfileSyncService* sync_service_;
   WebDatabase* web_database_;
   PersonalDataManager* personal_data_;
@@ -175,6 +181,8 @@ class AutofillProfileModelAssociator
   Lock abort_association_pending_lock_;
   bool abort_association_pending_;
 
+  int number_of_profiles_created_;
+
   DISALLOW_COPY_AND_ASSIGN(AutofillProfileModelAssociator);
 };
 
@@ -189,3 +197,4 @@ struct AutofillProfileModelAssociator::DataBundle {
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_MODEL_ASSOCIATOR_H_
+