Rest of the autofill work.

chrome/browser/sync/glue/autofill_model_associator2.cc

 // 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.
 
 #include "chrome/browser/sync/glue/autofill_model_associator2.h"
 
 #include <vector>
 
 #include "base/task.h"
 #include "base/time.h"
@@ skipping 195 matching lines @@
 
 bool AutofillModelAssociator2::MakeNewAutofillProfileSyncNode(
     sync_api::WriteTransaction* trans, const sync_api::BaseNode& autofill_root,
     const std::string& tag, const AutoFillProfile& profile, int64* sync_id) {
   sync_api::WriteNode node(trans);
   if (!node.InitUniqueByCreation(syncable::AUTOFILL, autofill_root, tag)) {
     LOG(ERROR) << "Failed to create autofill sync node.";
     return false;
   }
   node.SetTitle(UTF8ToWide(tag));
-  AutofillChangeProcessor::WriteAutofillProfile(profile, &node);
+  AutofillChangeProcessor2::WriteAutofillProfile(profile, &node);
   *sync_id = node.GetId();
   return true;
 }
 
 
 bool AutofillModelAssociator2::LoadAutofillData(
     std::vector<AutofillEntry>* entries,
     std::vector<AutoFillProfile*>* profiles) {
   if (IsAbortPending())
     return false;
@@ skipping 310 matching lines @@
   diff = MergeField2(p, EMAIL_ADDRESS, s.email_address()) || diff;
   diff = MergeField2(p, COMPANY_NAME, s.company_name()) || diff;
   diff = MergeField2(p, PHONE_FAX_WHOLE_NUMBER, s.phone_fax_whole_number())
       || diff;
   diff = MergeField2(p, PHONE_HOME_WHOLE_NUMBER, s.phone_home_whole_number())
       || diff;
   return diff;
 }
 
 }  // namespace browser_sync