chrome/browser/extensions/settings/setting_sync_data.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/extensions/settings/setting_sync_data.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: fix nigori access in testserver 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/extensions/extension_sync_data_unittest.cc ('k') | chrome/browser/extensions/settings/settings_sync_util.cc » ('j') | net/tools/testserver/chromiumsync.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/settings/setting_sync_data.cc

diff --git a/chrome/browser/extensions/settings/setting_sync_data.cc b/chrome/browser/extensions/settings/setting_sync_data.cc

index 68e62876b1709e1078de07fef5376762c6a3a0b3..43db227d3c8ddcafdeb41d459a8526d8cdbea0ac 100644

--- a/chrome/browser/extensions/settings/setting_sync_data.cc

+++ b/chrome/browser/extensions/settings/setting_sync_data.cc

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

#include "base/json/json_writer.h"

#include "chrome/browser/sync/api/sync_data.h"

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

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

namespace extensions {

@@ -25,7 +26,7 @@ void SettingSyncData::Init(

SyncChange::SyncChangeType change_type, const SyncData& sync_data) {

DCHECK(!internal_.get());

sync_pb::ExtensionSettingSpecifics specifics =

- sync_data.GetSpecifics().GetExtension(sync_pb::extension_setting);

+ sync_data.GetSpecifics().extension_setting();

Value* value =

base::JSONReader().JsonToValue(specifics.value(), false, false);

if (!value) {