Rest of the autofill work.

chrome/browser/sync/glue/bookmark_model_associator.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/bookmark_model_associator.h"
 
 #include <stack>
 
 #include "base/hash_tables.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #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"
 
 namespace browser_sync {
 
 // The sync protocol identifies top-level entities by means of well-known tags,
 // which should not be confused with titles.  Each tag corresponds to a
 // singleton instance of a particular top-level node in a user's share; the
 // tags are consistent across users. The tags allow us to locate the specific
 // folders whose contents we care about synchronizing, without having to do a
@@ skipping 125 matching lines @@
 const BookmarkNode* BookmarkNodeIdIndex::Find(int64 id) const {
   BookmarkIdMap::const_iterator iter = node_index_.find(id);
   return iter == node_index_.end() ? NULL : iter->second;
 }
 
 BookmarkModelAssociator::BookmarkModelAssociator(
     ProfileSyncService* sync_service,
     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_);
   DCHECK(persist_ids_error_handler_);
 }
 
 BookmarkModelAssociator::~BookmarkModelAssociator() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
@@ skipping 234 matching lines @@
     // At this point all the children nodes of the parent sync node have
     // corresponding children in the parent bookmark node and they are all in
     // the right positions: from 0 to index - 1.
     // So the children starting from index in the parent bookmark node are the
     // ones that are not present in the parent sync node. So create them.
     for (int i = index; i < parent_node->GetChildCount(); ++i) {
       sync_child_id = BookmarkChangeProcessor::CreateSyncNode(
           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;
 }
 
 void BookmarkModelAssociator::PostPersistAssociationsTask() {
   // No need to post a task if a task is already pending.
   if (!persist_associations_.empty())
     return;
   MessageLoop::current()->PostTask(
       FROM_HERE,
       persist_associations_.NewRunnableMethod(
@@ skipping 112 matching lines @@
 
   // It's possible that the number of nodes in the bookmark model is not the
   // same as number of nodes in the sync model. This can happen when the sync
   // model doesn't get a chance to persist its changes, for example when
   // Chrome does not shut down gracefully. In such cases we can't trust the
   // loaded associations.
   return sync_node_count == id_index.count();
 }
 
 }  // namespace browser_sync