chrome/browser/sync/glue/typed_url_change_processor.cc - Issue 10553042: sync: don't make DataTypeErrorHandler inherit UnrecoverableErrorHandler

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/typed_url_change_processor.cc

Issue 10553042: sync: don't make DataTypeErrorHandler inherit UnrecoverableErrorHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 8 years, 6 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/theme_data_type_controller_unittest.cc ('k') | chrome/browser/sync/glue/ui_data_type_controller.h » ('j') | chrome/browser/sync/glue/ui_data_type_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a235bb56f71818ffe5b83933d2913558c6ae7780..9299c4dda73a903b468dce65d96cfc83c48af57b 100644

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

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

@@ -112,7 +112,7 @@ bool TypedUrlChangeProcessor::CreateOrUpdateSyncNode(

sync_api::ReadNode typed_url_root(trans);

if (typed_url_root.InitByTagLookup(kTypedUrlTag) !=

sync_api::BaseNode::INIT_OK) {

- error_handler()->OnUnrecoverableError(FROM_HERE,

+ error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,

"Server did not create the top-level typed_url node. We "

"might be running against an out-of-date server.");

return false;

@@ -252,7 +252,7 @@ void TypedUrlChangeProcessor::ApplyChangesFromSyncModel(

sync_api::ReadNode typed_url_root(trans);

if (typed_url_root.InitByTagLookup(kTypedUrlTag) !=

sync_api::BaseNode::INIT_OK) {

- error_handler()->OnUnrecoverableError(FROM_HERE,

+ error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,

"TypedUrl root node lookup failed.");

return;

}