sync: Add location info to unrecoverable error.

chrome/browser/sync/glue/bookmark_model_associator.cc

 // Copyright (c) 2006-2009 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"
@@ skipping 137 matching lines @@
     AddAll(node->GetChild(i));
 }
 
 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* error_handler)
+    UnrecoverableErrorHandler* persist_ids_error_handler)
     : sync_service_(sync_service),
-      error_handler_(error_handler),
+      persist_ids_error_handler_(persist_ids_error_handler),
       ALLOW_THIS_IN_INITIALIZER_LIST(persist_associations_(this)) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   DCHECK(sync_service_);
+  DCHECK(persist_ids_error_handler_);
 }
 
 BookmarkModelAssociator::~BookmarkModelAssociator() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 }
 
 bool BookmarkModelAssociator::DisassociateModels() {
   id_map_.clear();
   id_map_inverse_.clear();
   dirty_associations_sync_ids_.clear();
@@ skipping 274 matching lines @@
 
   sync_api::WriteTransaction trans(
       sync_service_->backend()->GetUserShareHandle());
   DirtyAssociationsSyncIds::iterator iter;
   for (iter = dirty_associations_sync_ids_.begin();
        iter != dirty_associations_sync_ids_.end();
        ++iter) {
     int64 sync_id = *iter;
     sync_api::WriteNode sync_node(&trans);
     if (!sync_node.InitByIdLookup(sync_id)) {
-      error_handler_->OnUnrecoverableError();
+      persist_ids_error_handler_->OnUnrecoverableError(FROM_HERE,
+          "Could not lookup bookmark node for ID persistence.");
       return;
     }
     const BookmarkNode* node = GetChromeNodeFromSyncId(sync_id);
     if (node)
       sync_node.SetExternalId(node->id());
     else
       NOTREACHED();
   }
   dirty_associations_sync_ids_.clear();
 }
@@ skipping 78 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