Rest of the autofill work.

chrome/browser/sync/syncable/syncable.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_SYNCABLE_SYNCABLE_H_
 #define CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_
 #pragma once
 
 #include <algorithm>
 #include <bitset>
@@ skipping 618 matching lines @@
 // All methods which require the kernel lock to be already held take a
 // ScopeKernelLock* argument.
 //
 // To prevent deadlock, the reader writer transaction lock must always
 // be held before acquiring the kernel lock.
 class ScopedKernelLock;
 class IdFilter;
 class DirectoryManager;
 struct PathMatcher;
 
+struct AutofillMigrationDebugInfo {
+  enum PropertyToSet {
+    MIGRATION_TIME,
+    BOOKMARK_ADDED,
+    ENTRIES_ADDED,
+    PROFILES_ADDED
+  };
+  int64 autofill_migration_time;
+  int bookmarks_added_during_migration;
+  int autofill_entries_added_during_migration;
+  int autofill_profile_added_during_migration;
+};
+
 class Directory {
   friend class BaseTransaction;
   friend class Entry;
   friend class MutableEntry;
   friend class ReadTransaction;
   friend class ReadTransactionWithoutDB;
   friend class ScopedKernelLock;
   friend class ScopedKernelUnlock;
   friend class WriteTransaction;
   friend class SyncableDirectoryTest;
   FRIEND_TEST_ALL_PREFIXES(SyncableDirectoryTest,
                            TakeSnapshotGetsAllDirtyHandlesTest);
   FRIEND_TEST_ALL_PREFIXES(SyncableDirectoryTest,
                            TakeSnapshotGetsOnlyDirtyHandlesTest);
   FRIEND_TEST_ALL_PREFIXES(SyncableDirectoryTest, TestPurgeEntriesWithTypeIn);
   FRIEND_TEST_ALL_PREFIXES(SyncableDirectoryTest,
                            TakeSnapshotGetsMetahandlesToPurge);
 
  public:
   class EventListenerHookup;
 
   // Various data that the Directory::Kernel we are backing (persisting data
   // for) needs saved across runs of the application.
   struct PersistedKernelInfo {
+    enum AutofillMigrationState {
+      NOT_DETERMINED,
+      NOT_MIGRATED,
+      MIGRATED,
+      INSUFFICIENT_INFO_TO_DETERMINE
+    };
+
+    AutofillMigrationDebugInfo autofill_migration_debug_info;
+
     PersistedKernelInfo();
     ~PersistedKernelInfo();
 
     // Last sync timestamp fetched from the server.
     int64 last_download_timestamp[MODEL_TYPE_COUNT];
     // true iff we ever reached the end of the changelog.
     ModelTypeBitSet initial_sync_ended;
     // The store birthday we were given by the server. Contents are opaque to
     // the client.
     std::string store_birthday;
     // The next local ID that has not been used with this cache-GUID.
     int64 next_id;
     // The persisted notification state.
     std::string notification_state;
+
+    AutofillMigrationState autofill_migration_state;
   };
 
   // What the Directory needs on initialization to create itself and its Kernel.
   // Filled by DirectoryBackingStore::Load.
   struct KernelLoadInfo {
     PersistedKernelInfo kernel_info;
     std::string cache_guid;  // Created on first initialization, never changes.
     int64 max_metahandle;    // Computed (using sql MAX aggregate) on init.
     KernelLoadInfo() : max_metahandle(0) {
     }
@@ skipping 60 matching lines @@
         result.timestamp = stamp;
       }
       if (stamp == result.timestamp)
         result.data_types.set(i);
     }
     return result;
   }
 
   bool initial_sync_ended_for_type(ModelType type) const;
   void set_initial_sync_ended_for_type(ModelType type, bool value);
+  PersistedKernelInfo::AutofillMigrationState
+    get_autofill_migration_state() const;
+
+  AutofillMigrationDebugInfo get_autofill_migration_debug_info() const;
+
+  void set_autofill_migration_state(
+    PersistedKernelInfo::AutofillMigrationState state);
+
+  template <class T> void TestAndSet(T* kernel_data, const T* data_to_set);
+
+  void set_autofill_migration_state_debug_info(
+    syncable::AutofillMigrationDebugInfo::PropertyToSet property_to_set,
+    const syncable::AutofillMigrationDebugInfo& info);
 
   const std::string& name() const { return kernel_->name; }
 
   // (Account) Store birthday is opaque to the client,
   // so we keep it in the format it is in the proto buffer
   // in case we switch to a binary birthday later.
   std::string store_birthday() const;
   void set_store_birthday(std::string store_birthday);
 
   std::string GetAndClearNotificationState();
@@ skipping 371 matching lines @@
 void ZeroFields(EntryKernel* entry, int first_field);
 
 }  // namespace syncable
 
 std::ostream& operator <<(std::ostream&, const syncable::Blob&);
 
 browser_sync::FastDump& operator <<
   (browser_sync::FastDump&, const syncable::Blob&);
 
 #endif  // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_