sync/protocol/proto_enum_conversions_unittest.cc - Issue 11185064: FYI: Move conflict resolve + clean up afterwards

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: sync/protocol/proto_enum_conversions_unittest.cc

Issue 11185064: FYI: Move conflict resolve + clean up afterwards (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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:

Index: sync/protocol/proto_enum_conversions_unittest.cc

diff --git a/sync/protocol/proto_enum_conversions_unittest.cc b/sync/protocol/proto_enum_conversions_unittest.cc

index 0b491976f613e1031e9e17cf475b51de10da7561..f66d3796c2510269b34412bdeefb3d233b5d85ba 100644

--- a/sync/protocol/proto_enum_conversions_unittest.cc

+++ b/sync/protocol/proto_enum_conversions_unittest.cc

@@ -50,7 +50,7 @@ TEST_F(ProtoEnumConversionsTest, GetUpdatesSourceString) {

TestEnumStringFunction(

GetUpdatesSourceString,

sync_pb::GetUpdatesCallerInfo::GetUpdatesSource_MIN,

- sync_pb::GetUpdatesCallerInfo::SYNC_CYCLE_CONTINUATION);

+ sync_pb::GetUpdatesCallerInfo::PERIODIC);

TestEnumStringFunction(

GetUpdatesSourceString,

sync_pb::GetUpdatesCallerInfo::NEWLY_SUPPORTED_DATATYPE,

« no previous file with comments | « sync/protocol/get_updates_caller_info.proto ('k') | sync/sessions/session_state.h » ('j') | no next file with comments »