Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8098)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/syncable/directory_backing_store_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: 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/sync/syncable/directory_backing_store.cc ('k') | chrome/browser/sync/syncable/model_type.cc » ('j') | net/tools/testserver/chromiumsync.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/syncable/directory_backing_store_unittest.cc
diff --git a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
index 2b090e3590a4144a38e45681cb1dc5caa9227707..284e5d203fd9cffbbc23098e17eecf771ed11d91 100644
--- a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
+++ b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
@@ -1596,15 +1596,13 @@ TEST_F(DirectoryBackingStoreTest, MigrateVersion68To69) {
ASSERT_EQ("s_ID_2", s.ColumnString(3));
sync_pb::EntitySpecifics specifics;
specifics.ParseFromArray(s.ColumnBlob(4), s.ColumnByteLength(4));
- ASSERT_TRUE(specifics.HasExtension(sync_pb::bookmark));
- ASSERT_EQ("http://www.google.com/",
- specifics.GetExtension(sync_pb::bookmark).url());
- ASSERT_EQ("AASGASGA", specifics.GetExtension(sync_pb::bookmark).favicon());
+ ASSERT_TRUE(specifics.has_bookmark());
+ ASSERT_EQ("http://www.google.com/", specifics.bookmark().url());
+ ASSERT_EQ("AASGASGA", specifics.bookmark().favicon());
specifics.ParseFromArray(s.ColumnBlob(5), s.ColumnByteLength(5));
- ASSERT_TRUE(specifics.HasExtension(sync_pb::bookmark));
- ASSERT_EQ("http://www.google.com/2",
- specifics.GetExtension(sync_pb::bookmark).url());
- ASSERT_EQ("ASADGADGADG", specifics.GetExtension(sync_pb::bookmark).favicon());
+ ASSERT_TRUE(specifics.has_bookmark());
+ ASSERT_EQ("http://www.google.com/2", specifics.bookmark().url());
+ ASSERT_EQ("ASADGADGADG", specifics.bookmark().favicon());
ASSERT_FALSE(s.Step());
}
@@ -2062,44 +2060,42 @@ TEST_P(MigrationTest, ToCurrentVersion) {
EXPECT_TRUE((*it)->ref(IS_DIR));
EXPECT_TRUE((*it)->ref(SERVER_IS_DIR));
EXPECT_FALSE(
- (*it)->ref(SPECIFICS).GetExtension(sync_pb::bookmark).has_url());
+ (*it)->ref(SPECIFICS).bookmark().has_url());
EXPECT_FALSE(
- (*it)->ref(SERVER_SPECIFICS).GetExtension(sync_pb::bookmark).has_url());
+ (*it)->ref(SERVER_SPECIFICS).bookmark().has_url());
EXPECT_FALSE(
- (*it)->ref(SPECIFICS).GetExtension(sync_pb::bookmark).has_favicon());
- EXPECT_FALSE((*it)->ref(SERVER_SPECIFICS).
- GetExtension(sync_pb::bookmark).has_favicon());
+ (*it)->ref(SPECIFICS).bookmark().has_favicon());
+ EXPECT_FALSE((*it)->ref(SERVER_SPECIFICS).bookmark().has_favicon());
ASSERT_TRUE(++it != index.end());
ASSERT_EQ(7, (*it)->ref(META_HANDLE));
EXPECT_EQ("google_chrome", (*it)->ref(UNIQUE_SERVER_TAG));
- EXPECT_FALSE((*it)->ref(SPECIFICS).HasExtension(sync_pb::bookmark));
- EXPECT_FALSE((*it)->ref(SERVER_SPECIFICS).HasExtension(sync_pb::bookmark));
+ EXPECT_FALSE((*it)->ref(SPECIFICS).has_bookmark());
+ EXPECT_FALSE((*it)->ref(SERVER_SPECIFICS).has_bookmark());
ASSERT_TRUE(++it != index.end());
ASSERT_EQ(8, (*it)->ref(META_HANDLE));
EXPECT_EQ("google_chrome_bookmarks", (*it)->ref(UNIQUE_SERVER_TAG));
- EXPECT_TRUE((*it)->ref(SPECIFICS).HasExtension(sync_pb::bookmark));
- EXPECT_TRUE((*it)->ref(SERVER_SPECIFICS).HasExtension(sync_pb::bookmark));
+ EXPECT_TRUE((*it)->ref(SPECIFICS).has_bookmark());
+ EXPECT_TRUE((*it)->ref(SERVER_SPECIFICS).has_bookmark());
ASSERT_TRUE(++it != index.end());
ASSERT_EQ(9, (*it)->ref(META_HANDLE));
EXPECT_EQ("bookmark_bar", (*it)->ref(UNIQUE_SERVER_TAG));
- EXPECT_TRUE((*it)->ref(SPECIFICS).HasExtension(sync_pb::bookmark));
- EXPECT_TRUE((*it)->ref(SERVER_SPECIFICS).HasExtension(sync_pb::bookmark));
+ EXPECT_TRUE((*it)->ref(SPECIFICS).has_bookmark());
+ EXPECT_TRUE((*it)->ref(SERVER_SPECIFICS).has_bookmark());
ASSERT_TRUE(++it != index.end());
ASSERT_EQ(10, (*it)->ref(META_HANDLE));
EXPECT_FALSE((*it)->ref(IS_DEL));
- EXPECT_TRUE((*it)->ref(SPECIFICS).HasExtension(sync_pb::bookmark));
- EXPECT_TRUE((*it)->ref(SERVER_SPECIFICS).HasExtension(sync_pb::bookmark));
- EXPECT_FALSE((*it)->ref(SPECIFICS).GetExtension(sync_pb::bookmark).has_url());
+ EXPECT_TRUE((*it)->ref(SPECIFICS).has_bookmark());
+ EXPECT_TRUE((*it)->ref(SERVER_SPECIFICS).has_bookmark());
+ EXPECT_FALSE((*it)->ref(SPECIFICS).bookmark().has_url());
EXPECT_FALSE(
- (*it)->ref(SPECIFICS).GetExtension(sync_pb::bookmark).has_favicon());
+ (*it)->ref(SPECIFICS).bookmark().has_favicon());
EXPECT_FALSE(
- (*it)->ref(SERVER_SPECIFICS).GetExtension(sync_pb::bookmark).has_url());
- EXPECT_FALSE((*it)->ref(SERVER_SPECIFICS).
- GetExtension(sync_pb::bookmark).has_favicon());
+ (*it)->ref(SERVER_SPECIFICS).bookmark().has_url());
+ EXPECT_FALSE((*it)->ref(SERVER_SPECIFICS).bookmark().has_favicon());
EXPECT_EQ("other_bookmarks", (*it)->ref(UNIQUE_SERVER_TAG));
EXPECT_EQ("Other Bookmarks", (*it)->ref(NON_UNIQUE_NAME));
EXPECT_EQ("Other Bookmarks", (*it)->ref(SERVER_NON_UNIQUE_NAME));
@@ -2108,16 +2104,16 @@ TEST_P(MigrationTest, ToCurrentVersion) {
ASSERT_EQ(11, (*it)->ref(META_HANDLE));
EXPECT_FALSE((*it)->ref(IS_DEL));
EXPECT_FALSE((*it)->ref(IS_DIR));
- EXPECT_TRUE((*it)->ref(SPECIFICS).HasExtension(sync_pb::bookmark));
- EXPECT_TRUE((*it)->ref(SERVER_SPECIFICS).HasExtension(sync_pb::bookmark));
+ EXPECT_TRUE((*it)->ref(SPECIFICS).has_bookmark());
+ EXPECT_TRUE((*it)->ref(SERVER_SPECIFICS).has_bookmark());
EXPECT_EQ("http://dev.chromium.org/",
- (*it)->ref(SPECIFICS).GetExtension(sync_pb::bookmark).url());
+ (*it)->ref(SPECIFICS).bookmark().url());
EXPECT_EQ("AGATWA",
- (*it)->ref(SPECIFICS).GetExtension(sync_pb::bookmark).favicon());
+ (*it)->ref(SPECIFICS).bookmark().favicon());
EXPECT_EQ("http://dev.chromium.org/other",
- (*it)->ref(SERVER_SPECIFICS).GetExtension(sync_pb::bookmark).url());
+ (*it)->ref(SERVER_SPECIFICS).bookmark().url());
EXPECT_EQ("AFAGVASF",
- (*it)->ref(SERVER_SPECIFICS).GetExtension(sync_pb::bookmark).favicon());
+ (*it)->ref(SERVER_SPECIFICS).bookmark().favicon());
EXPECT_EQ("", (*it)->ref(UNIQUE_SERVER_TAG));
EXPECT_EQ("Home (The Chromium Projects)", (*it)->ref(NON_UNIQUE_NAME));
EXPECT_EQ("Home (The Chromium Projects)", (*it)->ref(SERVER_NON_UNIQUE_NAME));
@@ -2128,16 +2124,15 @@ TEST_P(MigrationTest, ToCurrentVersion) {
EXPECT_TRUE((*it)->ref(IS_DIR));
EXPECT_EQ("Extra Bookmarks", (*it)->ref(NON_UNIQUE_NAME));
EXPECT_EQ("Extra Bookmarks", (*it)->ref(SERVER_NON_UNIQUE_NAME));
- EXPECT_TRUE((*it)->ref(SPECIFICS).HasExtension(sync_pb::bookmark));
- EXPECT_TRUE((*it)->ref(SERVER_SPECIFICS).HasExtension(sync_pb::bookmark));
+ EXPECT_TRUE((*it)->ref(SPECIFICS).has_bookmark());
+ EXPECT_TRUE((*it)->ref(SERVER_SPECIFICS).has_bookmark());
EXPECT_FALSE(
- (*it)->ref(SPECIFICS).GetExtension(sync_pb::bookmark).has_url());
+ (*it)->ref(SPECIFICS).bookmark().has_url());
EXPECT_FALSE(
- (*it)->ref(SERVER_SPECIFICS).GetExtension(sync_pb::bookmark).has_url());
+ (*it)->ref(SERVER_SPECIFICS).bookmark().has_url());
EXPECT_FALSE(
- (*it)->ref(SPECIFICS).GetExtension(sync_pb::bookmark).has_favicon());
- EXPECT_FALSE((*it)->ref(SERVER_SPECIFICS).
- GetExtension(sync_pb::bookmark).has_favicon());
+ (*it)->ref(SPECIFICS).bookmark().has_favicon());
+ EXPECT_FALSE((*it)->ref(SERVER_SPECIFICS).bookmark().has_favicon());
ASSERT_TRUE(++it != index.end());
ASSERT_EQ(13, (*it)->ref(META_HANDLE));
« no previous file with comments | « chrome/browser/sync/syncable/directory_backing_store.cc ('k') | chrome/browser/sync/syncable/model_type.cc » ('j') | net/tools/testserver/chromiumsync.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698