chrome/browser/sync/engine/nigori_util_unittest.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/nigori_util_unittest.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: fred's review 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/download_updates_command_unittest.cc ('k') | chrome/browser/sync/engine/process_commit_response_command_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 1472f3933e17ec96febe3183eb8afbf8a75ffbaf..3c0d83c0e53a1db709b11d8c8aaa70b9415a89f8 100644

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

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

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

// found in the LICENSE file.

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

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

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

#include "chrome/browser/sync/engine/nigori_util.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -20,15 +21,15 @@ TEST(NigoriUtilTest, SpecificsNeedsEncryption) {

EXPECT_FALSE(SpecificsNeedsEncryption(ModelTypeSet(), specifics));

EXPECT_FALSE(SpecificsNeedsEncryption(encrypted_types, specifics));

- AddDefaultExtensionValue(PREFERENCES, &specifics);

+ AddDefaultFieldValue(PREFERENCES, &specifics);

EXPECT_FALSE(SpecificsNeedsEncryption(encrypted_types, specifics));

sync_pb::EntitySpecifics bookmark_specifics;

- AddDefaultExtensionValue(BOOKMARKS, &bookmark_specifics);

+ AddDefaultFieldValue(BOOKMARKS, &bookmark_specifics);

EXPECT_TRUE(SpecificsNeedsEncryption(encrypted_types, bookmark_specifics));

- bookmark_specifics.MutableExtension(sync_pb::bookmark)->set_title("title");

- bookmark_specifics.MutableExtension(sync_pb::bookmark)->set_url("url");

+ bookmark_specifics.mutable_bookmark()->set_title("title");

+ bookmark_specifics.mutable_bookmark()->set_url("url");

EXPECT_TRUE(SpecificsNeedsEncryption(encrypted_types, bookmark_specifics));

EXPECT_FALSE(SpecificsNeedsEncryption(ModelTypeSet(), bookmark_specifics));

@@ -37,7 +38,7 @@ TEST(NigoriUtilTest, SpecificsNeedsEncryption) {

EXPECT_FALSE(SpecificsNeedsEncryption(ModelTypeSet(), bookmark_specifics));

sync_pb::EntitySpecifics password_specifics;

- AddDefaultExtensionValue(PASSWORDS, &password_specifics);

+ AddDefaultFieldValue(PASSWORDS, &password_specifics);

EXPECT_FALSE(SpecificsNeedsEncryption(encrypted_types, password_specifics));

}