chrome/browser/sync/glue/non_frontend_data_type_controller.cc - Issue 9978017: [Sync] - Upload the callstacks for errors so that the line number of error is in callstack.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/glue/non_frontend_data_type_controller.cc

Issue 9978017: [Sync] - Upload the callstacks for errors so that the line number of error is in callstack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc ('k') | chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/non_frontend_data_type_controller.cc

diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc

index 8768fffa8123551ef1c8a5c06b3b77c8c4b9c063..2aa51491eda0ee384851873fd6df64c6fd93863b 100644

--- a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc

+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc

@@ -114,9 +114,10 @@ void NonFrontendDataTypeController::StartAssociation() {

base::TimeTicks start_time = base::TimeTicks::Now();

SyncError error;

- bool merge_success = model_associator_->AssociateModels(&error);

+ error = model_associator_->AssociateModels();

+ // TODO(lipalani): crbug.com/122690 - handle abort.

RecordAssociationTime(base::TimeTicks::Now() - start_time);

- if (!merge_success) {

+ if (error.IsSet()) {

StartFailed(ASSOCIATION_FAILED, error);

return;

}

@@ -249,7 +250,7 @@ void NonFrontendDataTypeController::StopAssociation() {

DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));

if (model_associator_.get()) {

SyncError error; // Not used.

- model_associator_->DisassociateModels(&error);

+ error = model_associator_->DisassociateModels();

}

model_associator_.reset();

change_processor_.reset();