sync: Add location info to unrecoverable error.

chrome/browser/sync/glue/preference_model_associator.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_PREFERENCE_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_PREFERENCE_MODEL_ASSOCIATOR_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 12 matching lines @@
 
 static const char kPreferencesTag[] = "google_chrome_preferences";
 
 // Contains all model association related logic:
 // * Algorithm to associate preferences model and sync model.
 class PreferenceModelAssociator
     : public PerDataTypeAssociatorInterface<PrefService::Preference,
                                             std::wstring> {
  public:
   static syncable::ModelType model_type() { return syncable::PREFERENCES; }
-  PreferenceModelAssociator(ProfileSyncService* sync_service,
-                            UnrecoverableErrorHandler* error_handler);
+  PreferenceModelAssociator(ProfileSyncService* sync_service);
   virtual ~PreferenceModelAssociator();
 
   // Returns the list of preference names that should be monitored for
   // changes.  Only preferences that are registered will be in this
   // list.
   const std::set<std::wstring>& synced_preferences() {
     return synced_preferences_;
   }
 
   // PerDataTypeAssociatorInterface implementation.
@@ skipping 35 matching lines @@
   // Associates the given preference name with the given sync id.
   virtual void Associate(const PrefService::Preference* node, int64 sync_id);
 
   // Remove the association that corresponds to the given sync id.
   virtual void Disassociate(int64 sync_id);
 
   // Returns whether a node with the given permanent tag was found and update
   // |sync_id| with that node's id.
   virtual bool GetSyncIdForTaggedNode(const std::string& tag, int64* sync_id);
 
- protected:
   // Returns sync service instance.
   ProfileSyncService* sync_service() { return sync_service_; }
 
  private:
   typedef std::map<std::wstring, int64> PreferenceNameToSyncIdMap;
   typedef std::map<int64, std::wstring> SyncIdToPreferenceNameMap;
 
   ProfileSyncService* sync_service_;
-  UnrecoverableErrorHandler* error_handler_;
   std::set<std::wstring> synced_preferences_;
   int64 preferences_node_id_;
 
   PreferenceNameToSyncIdMap id_map_;
   SyncIdToPreferenceNameMap id_map_inverse_;
 
   DISALLOW_COPY_AND_ASSIGN(PreferenceModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_PREFERENCE_MODEL_ASSOCIATOR_H_