Rest of the autofill work.

chrome/browser/sync/glue/bookmark_model_associator.cc

Index: chrome/browser/sync/glue/bookmark_model_associator.cc
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index 9e9fac71104cec4587a2b39b55e14ad973a61107..bd97c41d96c64cfde4919dbb773e7fe36b65bdf5 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/engine/syncapi.h"
+#include "chrome/browser/sync/syncable/syncable.h"

[tim (not reviewing), 2010/12/13 19:24:33]

illegal include

[lipalani, 2010/12/15 09:08:33]

Done.

 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 
@@ -159,6 +160,7 @@ BookmarkModelAssociator::BookmarkModelAssociator(
     UnrecoverableErrorHandler* persist_ids_error_handler)
     : sync_service_(sync_service),
       persist_ids_error_handler_(persist_ids_error_handler),
+      number_of_new_sync_nodes_created_at_association_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(persist_associations_(this)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(sync_service_);
@@ -413,8 +415,19 @@ bool BookmarkModelAssociator::BuildAssociations() {
           parent_node, model, i, &trans, this, sync_service_);
       if (parent_node->GetChild(i)->is_folder())
         dfs_stack.push(sync_child_id);
+      number_of_new_sync_nodes_created_at_association_++;
     }
   }
+
+  if (sync_service_->backend()->GetAutofillMigrationState() !=
+     syncable::MIGRATED) {

[tim (not reviewing), 2010/12/13 19:24:33]

4 space indent

[lipalani, 2010/12/14 21:05:57]

Done.

+    syncable::AutofillMigrationDebugInfo debug_info;
+    debug_info.bookmarks_added_during_migration =
+      number_of_new_sync_nodes_created_at_association_;

[tim (not reviewing), 2010/12/13 19:24:33]

4 space indent

[lipalani, 2010/12/14 21:05:57]

Done.

+    sync_service_->backend()->SetAutofillMigrationDebugInfo(
+      syncable::AutofillMigrationDebugInfo::BOOKMARK_ADDED,

[tim (not reviewing), 2010/12/13 19:24:33]

4 space indent

[lipalani, 2010/12/14 21:05:57]

Done.

+      debug_info);
+  }
   return true;
 }