sync: Add location info to unrecoverable error.

chrome/browser/sync/glue/bookmark_model_associator.h

Index: chrome/browser/sync/glue/bookmark_model_associator.h
===================================================================
--- chrome/browser/sync/glue/bookmark_model_associator.h	(revision 48898)
+++ chrome/browser/sync/glue/bookmark_model_associator.h	(working copy)
@@ -11,6 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/task.h"
+#include "chrome/browser/sync/unrecoverable_error_handler.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 
 class BookmarkNode;
@@ -26,7 +27,6 @@
 namespace browser_sync {
 
 class BookmarkChangeProcessor;
-class UnrecoverableErrorHandler;
 
 // Contains all model association related logic:
 // * Algorithm to associate bookmark model and sync model.
@@ -37,7 +37,7 @@
  public:
   static syncable::ModelType model_type() { return syncable::BOOKMARKS; }
   BookmarkModelAssociator(ProfileSyncService* sync_service,
-                          UnrecoverableErrorHandler* error_handler);
+      UnrecoverableErrorHandler* persist_ids_error_handler);
   virtual ~BookmarkModelAssociator();
 
   // AssociatorInterface implementation.
@@ -87,15 +87,15 @@
     // thread.
   }
 
+  // Returns sync service instance.
+  ProfileSyncService* sync_service() { return sync_service_; }
+
  protected:
   // Stores the id of the node with the given tag in |sync_id|.
   // Returns of that node was found successfully.
   // Tests override this.
   virtual bool GetSyncIdForTaggedNode(const std::string& tag, int64* sync_id);
 
-  // Returns sync service instance.
-  ProfileSyncService* sync_service() { return sync_service_; }
-
  private:
   typedef std::map<int64, int64> BookmarkIdToSyncIdMap;
   typedef std::map<int64, const BookmarkNode*> SyncIdToBookmarkNodeMap;
@@ -128,7 +128,7 @@
                   const sync_api::BaseNode* sync_node) const;
 
   ProfileSyncService* sync_service_;
-  UnrecoverableErrorHandler* error_handler_;
+  UnrecoverableErrorHandler* persist_ids_error_handler_;
   BookmarkIdToSyncIdMap id_map_;
   SyncIdToBookmarkNodeMap id_map_inverse_;
   // Stores sync ids for dirty associations.