Sending the proto files for review to unblcok the server team

chrome/browser/sync/glue/autofill_change_processor.h

Index: chrome/browser/sync/glue/autofill_change_processor.h
diff --git a/chrome/browser/sync/glue/autofill_change_processor.h b/chrome/browser/sync/glue/autofill_change_processor.h
index 7a845206a08047a8873fb3887ad15565ac8abd19..b1a2078e2729b5386e7e817b0bf6bdebf37e8f66 100644
--- a/chrome/browser/sync/glue/autofill_change_processor.h
+++ b/chrome/browser/sync/glue/autofill_change_processor.h
@@ -12,6 +12,7 @@
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/sync/engine/syncapi.h"
+#include "chrome/browser/sync/glue/autofill_change_processor2.h"
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"
@@ -71,7 +72,7 @@ class AutofillChangeProcessor : public ChangeProcessor,
  protected:
   virtual void StartImpl(Profile* profile);
   virtual void StopImpl();
-
+  
  private:
   void StartObserving();
   void StopObserving();
@@ -104,43 +105,15 @@ class AutofillChangeProcessor : public ChangeProcessor,
   void ApplySyncAutofillEntryDelete(
       const sync_pb::AutofillSpecifics& autofill);
   void ApplySyncAutofillProfileDelete(
-      const sync_pb::AutofillProfileSpecifics& profile,
       int64 sync_id);
 
-  // If the chrome model tries to add an AutoFillProfile with a label that
-  // is already in use, we perform a move-aside by calling-back into the chrome
-  // model and overwriting the label with a unique value we can apply for sync.
-  // This method should be called on an ADD notification from the chrome model.
-  // |tag| contains the unique sync client tag identifier for |profile|, which
-  // is derived from the profile label using ProfileLabelToTag.
-  // |existing_unique_label| is the current label of the object, if any; this
-  // is an allowed value, because it's taken by the item in question.
-  // For new items, set |existing_unique_label| to the empty string.
-  void ChangeProfileLabelIfAlreadyTaken(
-      sync_api::BaseTransaction* trans,
-      const string16& existing_unique_label,
-      AutoFillProfile* profile,
-      std::string* tag);
-
-  // Reassign the label of the profile, write this back to the web database,
-  // and update |tag| with the tag corresponding to the new label.
-  void OverrideProfileLabel(
-      const string16& new_label,
-      AutoFillProfile* profile_to_update,
-      std::string* tag_to_update);
-
-  // Helper to create a sync node with tag |tag|, storing |profile| as
-  // the node's AutofillSpecifics.
-  void AddAutofillProfileSyncNode(
-      sync_api::WriteTransaction* trans,
-      const sync_api::BaseNode& autofill,
-      const std::string& tag,
-      const AutoFillProfile* profile);
-
   // Helper to post a task to the UI loop to inform the PersonalDataManager
   // it needs to refresh itself.
   void PostOptimisticRefreshTask();
 
+  // Called to see if we need to upgrade to the new autofill2 profile.
+  bool IsUpgrading();
+
   // The two models should be associated according to this ModelAssociator.
   AutofillModelAssociator* model_associator_;