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

chrome/browser/sync/syncable/directory_backing_store.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/directory_backing_store.h"
 
 #include "build/build_config.h"
 
 #include <limits>
 
@@ skipping 551 matching lines @@
     const void* data, int size) {
   sync_pb::EntitySpecifics specifics;
   if (!specifics.ParseFromArray(data, size))
     return syncable::UNSPECIFIED;
   return syncable::GetModelTypeFromSpecifics(specifics);
 }
 
 // static
 string DirectoryBackingStore::ModelTypeEnumToModelId(ModelType model_type) {
   sync_pb::EntitySpecifics specifics;
-  syncable::AddDefaultExtensionValue(model_type, &specifics);
+  syncable::AddDefaultFieldValue(model_type, &specifics);
   return specifics.SerializeAsString();
 }
 
 // static
 std::string DirectoryBackingStore::GenerateCacheGUID() {
   // Generate a GUID with 128 bits of randomness.
   const int kGuidBytes = 128 / 8;
   std::string guid;
   base::Base64Encode(base::RandBytesAsString(kGuidBytes), &guid);
   return guid;
@@ skipping 90 matching lines @@
                                  sync_pb::EntitySpecifics* mutable_new_value) {
   // Extract data from the column trio we expect.
   bool old_is_bookmark_object = old_value_query->ColumnBool(old_value_column);
   std::string old_url = old_value_query->ColumnString(old_value_column + 1);
   std::string old_favicon;
   old_value_query->ColumnBlobAsString(old_value_column + 2, &old_favicon);
   bool old_is_dir = old_value_query->ColumnBool(old_value_column + 3);
 
   if (old_is_bookmark_object) {
     sync_pb::BookmarkSpecifics* bookmark_data =
-        mutable_new_value->MutableExtension(sync_pb::bookmark);
+        mutable_new_value->mutable_bookmark();
     if (!old_is_dir) {
       bookmark_data->set_url(old_url);
       bookmark_data->set_favicon(old_favicon);
     }
   }
 }
 
 }  // namespace
 
 bool DirectoryBackingStore::MigrateVersion68To69() {
@@ skipping 183 matching lines @@
   while (query.Step()) {
     ModelType type = ModelIdToModelTypeEnum(query.ColumnBlob(0),
                                             query.ColumnByteLength(0));
     if (type != UNSPECIFIED) {
       // Set the |timestamp_token_for_migration| on a new
       // DataTypeProgressMarker, using the old value of last_download_timestamp.
       // The server will turn this into a real token on our behalf the next
       // time we check for updates.
       sync_pb::DataTypeProgressMarker progress_marker;
       progress_marker.set_data_type_id(
-          GetExtensionFieldNumberFromModelType(type));
+          GetSpecificsFieldNumberFromModelType(type));
       progress_marker.set_timestamp_token_for_migration(query.ColumnInt64(1));
       std::string progress_blob;
       progress_marker.SerializeToString(&progress_blob);
 
       update.BindBlob(0, query.ColumnBlob(0), query.ColumnByteLength(0));
       update.BindBlob(1, progress_blob.data(), progress_blob.length());
       update.BindBool(2, query.ColumnBool(2));
       if (!update.Run())
         return false;
       update.Reset();
@@ skipping 194 matching lines @@
       "id TEXT primary key, "
       "name TEXT, "
       "store_birthday TEXT, "
       "db_create_version TEXT, "
       "db_create_time INT, "
       "next_id INT default -2, "
       "cache_guid TEXT )");
   return db_.Execute(query.c_str());
 }
 }  // namespace syncable