sync: remove use of protobuf extensions in protocol to reduce static init overhead.

chrome/browser/sync/syncable/syncable_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/syncable/syncable.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 44 matching lines @@
     ADD_FAILURE();
   }
 }
 
 namespace {
 void PutDataAsBookmarkFavicon(WriteTransaction* wtrans,
                               MutableEntry* e,
                               const char* bytes,
                               size_t bytes_length) {
   sync_pb::EntitySpecifics specifics;
-  specifics.MutableExtension(sync_pb::bookmark)->set_url("http://demo/");
-  specifics.MutableExtension(sync_pb::bookmark)->set_favicon(bytes,
-      bytes_length);
+  specifics.mutable_bookmark()->set_url("http://demo/");
+  specifics.mutable_bookmark()->set_favicon(bytes, bytes_length);
   e->Put(SPECIFICS, specifics);
 }
 
 void ExpectDataFromBookmarkFaviconEquals(BaseTransaction* trans,
                                          Entry* e,
                                          const char* bytes,
                                          size_t bytes_length) {
   ASSERT_TRUE(e->good());
-  ASSERT_TRUE(e->Get(SPECIFICS).HasExtension(sync_pb::bookmark));
-  ASSERT_EQ("http://demo/",
-      e->Get(SPECIFICS).GetExtension(sync_pb::bookmark).url());
+  ASSERT_TRUE(e->Get(SPECIFICS).has_bookmark());
+  ASSERT_EQ("http://demo/", e->Get(SPECIFICS).bookmark().url());
   ASSERT_EQ(std::string(bytes, bytes_length),
-      e->Get(SPECIFICS).GetExtension(sync_pb::bookmark).favicon());
+            e->Get(SPECIFICS).bookmark().favicon());
 }
 }  // namespace
 
 class SyncableGeneralTest : public testing::Test {
  public:
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     db_path_ = temp_dir_.path().Append(
         FILE_PATH_LITERAL("SyncableTest.sqlite3"));
   }
@@ skipping 1103 matching lines @@
   EntryKernel create_post_save, update_post_save;
   std::string create_name =  "Create";
 
   {
     WriteTransaction trans(FROM_HERE, UNITTEST, dir_.get());
     MutableEntry create(&trans, CREATE, trans.root_id(), create_name);
     MutableEntry update(&trans, CREATE_NEW_UPDATE_ITEM, update_id);
     create.Put(IS_UNSYNCED, true);
     update.Put(IS_UNAPPLIED_UPDATE, true);
     sync_pb::EntitySpecifics specifics;
-    specifics.MutableExtension(sync_pb::bookmark)->set_favicon("PNG");
-    specifics.MutableExtension(sync_pb::bookmark)->set_url("http://nowhere");
+    specifics.mutable_bookmark()->set_favicon("PNG");
+    specifics.mutable_bookmark()->set_url("http://nowhere");
     create.Put(SPECIFICS, specifics);
     create_pre_save = create.GetKernelCopy();
     update_pre_save = update.GetKernelCopy();
     create_id = create.Get(ID);
   }
 
   dir_->SaveChanges();
   browser_sync::TestUnrecoverableErrorHandler handler;
   dir_.reset(new Directory(&handler, NULL));
   ASSERT_TRUE(dir_.get());
@@ skipping 646 matching lines @@
 TEST_F(SyncableClientTagTest, TestClientTagIndexDuplicateServer) {
   EXPECT_TRUE(CreateWithDefaultTag(factory_.NewServerId(), true));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), true));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), false));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), false));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), true));
 }
 
 }  // namespace
 }  // namespace syncable