Rest of the autofill work.

chrome/browser/sync/engine/syncapi.h

Index: chrome/browser/sync/engine/syncapi.h
diff --git a/chrome/browser/sync/engine/syncapi.h b/chrome/browser/sync/engine/syncapi.h
index 2019f410b321ec4187f1f5a4da2120f9e4e61d28..133935a8421860b176e6e8a14f9d197e3f48ecf8 100644
--- a/chrome/browser/sync/engine/syncapi.h
+++ b/chrome/browser/sync/engine/syncapi.h
@@ -48,6 +48,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/sync/protocol/password_specifics.pb.h"
 #include "chrome/browser/sync/syncable/model_type.h"
+#include "chrome/browser/sync/syncable/syncable.h"

[tim (not reviewing), 2010/12/09 20:04:14]

we can't do this.  the whole point of syncapi is to be a facade atop syncable
and the rest of engine.  the inclusion of model_type is less egregious since we
could (and should, perhaps) put that file anywhere or in a /public/ directory. 
the cryptographer include is egregious.  there are todo's all over the code to
try and clean up cases like this :( (see sync_backend_host.cc@25).  Step 1 is to
stop the bleeding.

Given the precedence, it's not your fault for adding this :)
We have a bug to add a check_deps rule for sync so that these changes would fail
to build on try bots... we should really get on that.

[lipalani, 2010/12/11 00:12:36]

Done.

 #include "chrome/browser/sync/util/cryptographer.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "googleurl/src/gurl.h"
@@ -70,6 +71,7 @@ struct NotifierOptions;
 // may have opaque pointers to these types.
 namespace syncable {
 class BaseTransaction;
+class Directory;
 class DirectoryManager;
 class Entry;
 class MutableEntry;
@@ -347,6 +349,9 @@ class WriteNode : public BaseNode {
   // Should only be called if GetModelType() == AUTOFILL.
   void SetAutofillSpecifics(const sync_pb::AutofillSpecifics& specifics);
 
+  void SetAutofillProfileSpecifics(
+      const sync_pb::AutofillProfileSpecifics& specifics);
+
   // Set the nigori specifics.
   // Should only be called if GetModelType() == NIGORI.
   void SetNigoriSpecifics(const sync_pb::NigoriSpecifics& specifics);
@@ -398,6 +403,8 @@ class WriteNode : public BaseNode {
       const sync_pb::AppSpecifics& new_value);
   void PutAutofillSpecificsAndMarkForSyncing(
       const sync_pb::AutofillSpecifics& new_value);
+  void PutAutofillProfileSpecificsAndMarkForSyncing(
+      const sync_pb::AutofillProfileSpecifics& new_value);
   void PutBookmarkSpecificsAndMarkForSyncing(
       const sync_pb::BookmarkSpecifics& new_value);
   void PutNigoriSpecificsAndMarkForSyncing(
@@ -560,6 +567,8 @@ class WriteTransaction : public BaseTransaction {
   DISALLOW_COPY_AND_ASSIGN(WriteTransaction);
 };
 
+
+using syncable::Directory;

[tim (not reviewing), 2010/12/09 20:04:14]

using declaration not allowed in .h

[lipalani, 2010/12/11 00:12:36]

Done.

 // SyncManager encapsulates syncable::DirectoryManager and serves as the parent
 // of all other objects in the sync API.  SyncManager is thread-safe.  If
 // multiple threads interact with the same local sync repository (i.e. the
@@ -817,6 +826,21 @@ class SyncManager {
   // called.
   bool InitialSyncEndedForAllEnabledTypes();
 
+  void ConfigureAutofillMigration();
+
+  syncable::Directory::PersistedKernelInfo::AutofillMigrationState
+    GetAutofillMigrationState();

[tim (not reviewing), 2010/12/09 20:04:14]

if you want to go through syncapi for this, you'll have to declare types here
and convert in the .cc file.  syncapi.h isn't a "master include" file for all
the guts of sync/, it's a facade that should abstract away very nitty gritty
details like PersistedKernelInfo.  It makes the whole api much more confusing
and challenging to conceptualize as a hermetic "sync" "api".

[lipalani, 2010/12/11 00:12:36]

Done.

+
+  void SetAutofillMigrationState(
+    syncable::Directory::PersistedKernelInfo::AutofillMigrationState state);
+
+  syncable::AutofillMigrationDebugInfo
+      GetAutofillMigrationDebugInfo();
+
+  void SetAutofillMigrationDebugInfo(
+      syncable::AutofillMigrationDebugInfo::PropertyToSet property_to_set,
+      const syncable::AutofillMigrationDebugInfo& info);
+
   // Migrate tokens from user settings DB to the token service.
   void MigrateTokens();