Rest of the autofill work.

chrome/browser/sync/glue/autofill_model_associator.h

Index: chrome/browser/sync/glue/autofill_model_associator.h
diff --git a/chrome/browser/sync/glue/autofill_model_associator.h b/chrome/browser/sync/glue/autofill_model_associator.h
index 1439d227e558c8d902eb715bb2b39b4c4c488388..a815d937de57b55bdbb7348fd143dcd1fd133516 100644
--- a/chrome/browser/sync/glue/autofill_model_associator.h
+++ b/chrome/browser/sync/glue/autofill_model_associator.h
@@ -52,17 +52,6 @@ class AutofillModelAssociator
                           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.
@@ -119,7 +108,7 @@ class AutofillModelAssociator
   // 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 IsUpgrading();
+  virtual bool IsUpgrading(sync_api::WriteTransaction* trans);
 
   AutoFillProfile* FindCorrespondingNodeFromWebDB(
     const sync_pb::AutofillProfileSpecifics& profile,
@@ -178,16 +167,6 @@ class AutofillModelAssociator
       const sync_api::ReadNode& node,
       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();