[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

 // Copyright (c) 2012 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 <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 1001 matching lines @@
 TEST_F(ProfileSyncServiceSessionTest, DISABLED_MissingHeaderAndTab) {
   AddTab(browser(), GURL("http://foo1"));
   NavigateAndCommitActiveTab(GURL("http://foo2"));
   AddTab(browser(), GURL("http://bar1"));
   NavigateAndCommitActiveTab(GURL("http://bar2"));
   CreateRootHelper create_root(this);
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   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());
     sync_api::ReadNode root(&trans);
     root.InitByTagLookup(syncable::ModelTypeToRootTag(syncable::SESSIONS));
     sync_api::WriteNode extra_header(&trans);
     ASSERT_TRUE(extra_header.InitUniqueByCreation(syncable::SESSIONS,
                                                   root, "new_tag"));
     sync_pb::SessionSpecifics specifics;
     specifics.set_session_tag(local_tag);
     extra_header.SetSessionSpecifics(specifics);
   }
-  ASSERT_TRUE(model_associator_->AssociateModels(&error));
+
+  error = model_associator_->AssociateModels();
   ASSERT_FALSE(error.IsSet());
 }
 
 // TODO(jhorwich): Re-enable when crbug.com/121487 addressed
 TEST_F(ProfileSyncServiceSessionTest, DISABLED_MultipleHeaders) {
   AddTab(browser(), GURL("http://foo1"));
   NavigateAndCommitActiveTab(GURL("http://foo2"));
   AddTab(browser(), GURL("http://bar1"));
   NavigateAndCommitActiveTab(GURL("http://bar2"));
   CreateRootHelper create_root(this);
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   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());
     sync_api::ReadNode root(&trans);
     root.InitByTagLookup(syncable::ModelTypeToRootTag(syncable::SESSIONS));
     sync_api::WriteNode extra_header(&trans);
     ASSERT_TRUE(extra_header.InitUniqueByCreation(syncable::SESSIONS,
                                                   root, local_tag + "_"));
     sync_pb::SessionSpecifics specifics;
     specifics.set_session_tag(local_tag);
     specifics.mutable_header();
     extra_header.SetSessionSpecifics(specifics);
   }
-  ASSERT_TRUE(model_associator_->AssociateModels(&error));
+  error = model_associator_->AssociateModels();
   ASSERT_FALSE(error.IsSet());
 }
 
 // TODO(jhorwich): Re-enable when crbug.com/121487 addressed
 TEST_F(ProfileSyncServiceSessionTest, DISABLED_CorruptedForeign) {
   AddTab(browser(), GURL("http://foo1"));
   NavigateAndCommitActiveTab(GURL("http://foo2"));
   AddTab(browser(), GURL("http://bar1"));
   NavigateAndCommitActiveTab(GURL("http://bar2"));
   CreateRootHelper create_root(this);
   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.
     std::string foreign_tag = "foreign_tag";
     sync_api::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare());
     sync_api::ReadNode root(&trans);
     root.InitByTagLookup(syncable::ModelTypeToRootTag(syncable::SESSIONS));
     sync_api::WriteNode extra_header(&trans);
     ASSERT_TRUE(extra_header.InitUniqueByCreation(syncable::SESSIONS,
                                                   root, foreign_tag));
     sync_pb::SessionSpecifics specifics;
     specifics.set_session_tag(foreign_tag);
     extra_header.SetSessionSpecifics(specifics);
   }
-  ASSERT_TRUE(model_associator_->AssociateModels(&error));
+  error = model_associator_->AssociateModels();
   ASSERT_FALSE(error.IsSet());
 }
 
 // TODO(jhorwich): Re-enable when crbug.com/121487 addressed
 TEST_F(ProfileSyncServiceSessionTest, DISABLED_MissingLocalTabNode) {
   AddTab(browser(), GURL("http://foo1"));
   NavigateAndCommitActiveTab(GURL("http://foo2"));
   AddTab(browser(), GURL("http://bar1"));
   NavigateAndCommitActiveTab(GURL("http://bar2"));
   CreateRootHelper create_root(this);
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   std::string local_tag = model_associator_->GetCurrentMachineTag();
   SyncError error;
 
-  ASSERT_TRUE(model_associator_->DisassociateModels(&error));
+  error = model_associator_->DisassociateModels();
+  ASSERT_FALSE(error.IsSet());
   {
     // Delete the first sync tab node.
     std::string tab_tag = SessionModelAssociator::TabIdToTag(local_tag, 0);
 
     sync_api::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare());
     sync_api::ReadNode root(&trans);
     root.InitByTagLookup(syncable::ModelTypeToRootTag(syncable::SESSIONS));
     sync_api::WriteNode tab_node(&trans);
     ASSERT_TRUE(tab_node.InitByClientTagLookup(syncable::SESSIONS, tab_tag));
     tab_node.Remove();
   }
-  ASSERT_TRUE(model_associator_->AssociateModels(&error));
+  error = model_associator_->AssociateModels();
   ASSERT_FALSE(error.IsSet());
 
   // Add some more tabs to ensure we don't conflict with the pre-existing tab
   // node.
   AddTab(browser(), GURL("http://baz1"));
   AddTab(browser(), GURL("http://baz2"));
 }
 
 }  // namespace browser_sync