chrome/browser/sync/engine/syncer_proto_util.cc - Issue 9460047: sync: remove use of protobuf extensions in protocol to reduce static init overhead.

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

Issue 9460047: sync: remove use of protobuf extensions in protocol to reduce static init overhead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nick's comment Created 8 years, 10 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/syncapi_internal.cc ('k') | chrome/browser/sync/engine/syncer_unittest.cc » ('j') | chrome/browser/sync/protocol/proto_value_conversions.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 53c917af49c17ebb98e8d8314cfa00b08fc997be..d0712b51fb94fd313db2f37b770261abe2e2d9cf 100644

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

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

@@ -111,7 +111,7 @@ void SyncerProtoUtil::HandleMigrationDoneResponse(

<< "MIGRATION_DONE but no types specified.";

syncable::ModelTypeSet to_migrate;

for (int i = 0; i < response->migrated_data_type_id_size(); i++) {

- to_migrate.Put(syncable::GetModelTypeFromExtensionFieldNumber(

+ to_migrate.Put(syncable::GetModelTypeFromSpecificsFieldNumber(

response->migrated_data_type_id(i)));

}

// TODO(akalin): This should be a set union.

@@ -301,7 +301,7 @@ browser_sync::SyncProtocolError ConvertErrorPBToLocalType(

DCHECK_EQ(error.error_type(), sync_pb::SyncEnums::THROTTLED);

for (int i = 0; i < error.error_data_type_ids_size(); ++i) {

sync_protocol_error.error_data_types.Put(

- syncable::GetModelTypeFromExtensionFieldNumber(

+ syncable::GetModelTypeFromSpecificsFieldNumber(

error.error_data_type_ids(i)));

}