[Sync] - Upload the callstacks for errors so that the line number of error is in callstack.

chrome/browser/sync/glue/session_model_associator.h

Index: chrome/browser/sync/glue/session_model_associator.h
diff --git a/chrome/browser/sync/glue/session_model_associator.h b/chrome/browser/sync/glue/session_model_associator.h
index 509cac8c5cfb071851e09085b97cfe3c84994f1e..8af0d07f3974042ad4b2ef58e21ab2d2d55ee55c 100644
--- a/chrome/browser/sync/glue/session_model_associator.h
+++ b/chrome/browser/sync/glue/session_model_associator.h
@@ -22,6 +22,7 @@
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
+#include "chrome/browser/sync/glue/data_type_error_handler.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "chrome/browser/sync/glue/synced_session_tracker.h"
 #include "chrome/browser/sync/glue/synced_tab_delegate.h"
@@ -58,7 +59,8 @@ class SessionModelAssociator
       public base::NonThreadSafe {
  public:
   // Does not take ownership of sync_service.
-  explicit SessionModelAssociator(ProfileSyncService* sync_service);
+  SessionModelAssociator(ProfileSyncService* sync_service,
+                         DataTypeErrorHandler* error_handler);
   SessionModelAssociator(ProfileSyncService* sync_service,
                          bool setup_for_test);
   virtual ~SessionModelAssociator();
@@ -132,7 +134,7 @@ class SessionModelAssociator
   // client and creates any further sync nodes needed to store local header and
   // tab info.
   // |error| gets set if any association error occurred.

[Nicolas Zea, 2012/04/05 22:08:58]

remove comment (here and DisassociateModels)

[lipalani1, 2012/04/05 22:51:03]

Done.

-  virtual bool AssociateModels(SyncError* error) OVERRIDE;
+  virtual SyncError AssociateModels() OVERRIDE;
 
   // Initializes the given sync node from the given chrome node id.
   // Returns false if no sync node was found for the given chrome node id or
@@ -143,7 +145,7 @@ class SessionModelAssociator
   // Clear local sync data buffers. Does not delete sync nodes to avoid
   // tombstones. TODO(zea): way to eventually delete orphaned nodes.
   // |error| gets set if any disassociation error occurred.
-  virtual bool DisassociateModels(SyncError* error) OVERRIDE;
+  virtual SyncError DisassociateModels() OVERRIDE;
 
   // Returns the tag used to uniquely identify this machine's session in the
   // sync model.
@@ -470,6 +472,8 @@ class SessionModelAssociator
   // Pref service. Used to persist the session sync guid. Weak pointer.
   PrefService* const pref_service_;
 
+  DataTypeErrorHandler* error_handler_;
+
   DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator);
 };