chrome/browser/sync/engine/syncapi_internal.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/syncapi_internal.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/store_timestamps_command.cc ('k') | chrome/browser/sync/engine/syncer_proto_util.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/syncapi_internal.cc

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

index 3db0ea811476f2a85d308444812cbff3c15c8c06..8bd5c1d7c53e2c3a55c45078ee85b02dce662575 100644

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

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

@@ -7,6 +7,7 @@

#include "base/memory/scoped_ptr.h"

#include "chrome/browser/sync/util/cryptographer.h"

#include "chrome/browser/sync/protocol/password_specifics.pb.h"

+#include "chrome/browser/sync/protocol/sync.pb.h"

using browser_sync::Cryptographer;

@@ -14,10 +15,9 @@ namespace sync_api {

sync_pb::PasswordSpecificsData* DecryptPasswordSpecifics(

const sync_pb::EntitySpecifics& specifics, Cryptographer* crypto) {

- if (!specifics.HasExtension(sync_pb::password))

+ if (!specifics.has_password())

return NULL;

- const sync_pb::PasswordSpecifics& password_specifics =

- specifics.GetExtension(sync_pb::password);

+ const sync_pb::PasswordSpecifics& password_specifics = specifics.password();

if (!password_specifics.has_encrypted())

return NULL;

const sync_pb::EncryptedData& encrypted = password_specifics.encrypted();