chrome/browser/sync/engine/model_safe_worker.cc - Issue 6690020: sync: hook up ServerConnectionManager <> SyncerThread2 and tie up more loose ends

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/engine/model_safe_worker.cc

Issue 6690020: sync: hook up ServerConnectionManager <> SyncerThread2 and tie up more loose ends (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/debug

Patch Set: fix Created 9 years, 9 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/engine/cleanup_disabled_types_command_unittest.cc ('k') | chrome/browser/sync/engine/net/server_connection_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/engine/model_safe_worker.cc

diff --git a/chrome/browser/sync/engine/model_safe_worker.cc b/chrome/browser/sync/engine/model_safe_worker.cc

index c488e3bf173ffa329fc1e28e681c07aa9abd8a78..d9f44bfc3db2865d27c89a1850310191f99a10ec 100644

--- a/chrome/browser/sync/engine/model_safe_worker.cc

+++ b/chrome/browser/sync/engine/model_safe_worker.cc

@@ -14,7 +14,7 @@ ModelSafeGroup GetGroupForModelType(const syncable::ModelType type,

// with the server's PermanentItemPopulator is causing TLF updates in

// some cases. See bug 36735.

if (type != syncable::UNSPECIFIED && type != syncable::TOP_LEVEL_FOLDER)

- NOTREACHED() << "Entry does not belong to active ModelSafeGroup!";

+ LOG(WARNING) << "Entry does not belong to active ModelSafeGroup!";

return GROUP_PASSIVE;

}

return it->second;