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

chrome/browser/sync/profile_sync_service_session_unittest.cc

Index: chrome/browser/sync/profile_sync_service_session_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc
index 17742bafd8deb2b3b7318bf81b358de4e1b9c98b..f49c4595fda4da9ee25edd7c083030627ebae067 100644
--- a/chrome/browser/sync/profile_sync_service_session_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc
@@ -1026,7 +1026,8 @@ TEST_F(ProfileSyncServiceSessionTest, MissingHeaderAndTab) {
   SyncError error;
   std::string local_tag = model_associator_->GetCurrentMachineTag();
 
-  ASSERT_TRUE(model_associator_->DisassociateModels(&error));
+  error = model_associator_->DisassociateModels();
+  ASSERT_FALSE(error.IsSet());
   {
     // Create a sync node with the local tag but neither header nor tab field.
     sync_api::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare());
@@ -1039,7 +1040,8 @@ TEST_F(ProfileSyncServiceSessionTest, MissingHeaderAndTab) {
     specifics.set_session_tag(local_tag);
     extra_header.SetSessionSpecifics(specifics);
   }
-  ASSERT_TRUE(model_associator_->AssociateModels(&error));
+
+  error = model_associator_->AssociateModels();
   ASSERT_FALSE(error.IsSet());
 }
 
@@ -1053,7 +1055,8 @@ TEST_F(ProfileSyncServiceSessionTest, MultipleHeaders) {
   SyncError error;
   std::string local_tag = model_associator_->GetCurrentMachineTag();
 
-  ASSERT_TRUE(model_associator_->DisassociateModels(&error));
+  error = model_associator_->DisassociateModels();
+  ASSERT_FALSE(error.IsSet());
   {
     // Create another sync node with a header field and the local tag.
     sync_api::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare());
@@ -1067,7 +1070,7 @@ TEST_F(ProfileSyncServiceSessionTest, MultipleHeaders) {
     specifics.mutable_header();
     extra_header.SetSessionSpecifics(specifics);
   }
-  ASSERT_TRUE(model_associator_->AssociateModels(&error));
+  error = model_associator_->AssociateModels();
   ASSERT_FALSE(error.IsSet());
 }
 
@@ -1080,7 +1083,8 @@ TEST_F(ProfileSyncServiceSessionTest, CorruptedForeign) {
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   SyncError error;
 
-  ASSERT_TRUE(model_associator_->DisassociateModels(&error));
+  error = model_associator_->DisassociateModels();
+  ASSERT_FALSE(error.IsSet());
   {
     // Create another sync node with neither header nor tab field and a foreign
     // tag.
@@ -1095,7 +1099,7 @@ TEST_F(ProfileSyncServiceSessionTest, CorruptedForeign) {
     specifics.set_session_tag(foreign_tag);
     extra_header.SetSessionSpecifics(specifics);
   }
-  ASSERT_TRUE(model_associator_->AssociateModels(&error));
+  error = model_associator_->AssociateModels();
   ASSERT_FALSE(error.IsSet());
 }