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

chrome/browser/sync/internal_api/base_node.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/internal_api/base_node.h"
 
 #include "base/base64.h"
 #include "base/sha1.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 45 matching lines @@
   }
   *out = std::string(server_name.c_str(), length_to_copy);
 }
 
 BaseNode::BaseNode() : password_data_(new sync_pb::PasswordSpecificsData) {}
 
 BaseNode::~BaseNode() {}
 
 std::string BaseNode::GenerateSyncableHash(
     syncable::ModelType model_type, const std::string& client_tag) {
-  // blank PB with just the extension in it has termination symbol,
-  // handy for delimiter
+  // Blank PB with just the field in it has termination symbol,
+  // handy for delimiter.
   sync_pb::EntitySpecifics serialized_type;
-  syncable::AddDefaultExtensionValue(model_type, &serialized_type);
+  syncable::AddDefaultFieldValue(model_type, &serialized_type);
   std::string hash_input;
   serialized_type.AppendToString(&hash_input);
   hash_input.append(client_tag);
 
   std::string encode_output;
   CHECK(base::Base64Encode(base::SHA1HashString(hash_input), &encode_output));
   return encode_output;
 }
 
 bool BaseNode::DecryptIfNecessary() {
   if (!GetEntry()->Get(syncable::UNIQUE_SERVER_TAG).empty())
       return true;  // Ignore unique folders.
   const sync_pb::EntitySpecifics& specifics =
       GetEntry()->Get(syncable::SPECIFICS);
-  if (specifics.HasExtension(sync_pb::password)) {
+  if (specifics.has_password()) {
     // Passwords have their own legacy encryption structure.
     scoped_ptr<sync_pb::PasswordSpecificsData> data(DecryptPasswordSpecifics(
         specifics, GetTransaction()->GetCryptographer()));
     if (!data.get()) {
       LOG(ERROR) << "Failed to decrypt password specifics.";
       return false;
     }
     password_data_.swap(data);
     return true;
   }
 
   // We assume any node with the encrypted field set has encrypted data and if
   // not we have no work to do, with the exception of bookmarks. For bookmarks
   // we must make sure the bookmarks data has the title field supplied. If not,
   // we fill the unencrypted_data_ with a copy of the bookmark specifics that
   // follows the new bookmarks format.
   if (!specifics.has_encrypted()) {
     if (GetModelType() == syncable::BOOKMARKS &&
-        !specifics.GetExtension(sync_pb::bookmark).has_title() &&
+        !specifics.bookmark().has_title() &&
         !GetTitle().empty()) {  // Last check ensures this isn't a new node.
       // We need to fill in the title.
       std::string title = GetTitle();
       std::string server_legal_title;
       SyncAPINameToServerName(title, &server_legal_title);
       DVLOG(1) << "Reading from legacy bookmark, manually returning title "
                << title;
       unencrypted_data_.CopyFrom(specifics);
-      unencrypted_data_.MutableExtension(sync_pb::bookmark)->set_title(
+      unencrypted_data_.mutable_bookmark()->set_title(
           server_legal_title);
     }
     return true;
   }
 
   const sync_pb::EncryptedData& encrypted = specifics.encrypted();
   std::string plaintext_data = GetTransaction()->GetCryptographer()->
       DecryptToString(encrypted);
   if (plaintext_data.length() == 0 ||
       !unencrypted_data_.ParseFromString(plaintext_data)) {
@@ skipping 14 matching lines @@
     DCHECK_NE(syncable::GetModelTypeFromSpecifics(unencrypted_data_),
               syncable::UNSPECIFIED);
     return unencrypted_data_;
   } else {
     // Due to the change in bookmarks format, we need to check to see if this is
     // a legacy bookmarks (and has no title field in the proto). If it is, we
     // return the unencrypted_data_, which was filled in with the title by
     // DecryptIfNecessary().
     if (GetModelType() == syncable::BOOKMARKS) {
       const sync_pb::BookmarkSpecifics& bookmark_specifics =
-          specifics.GetExtension(sync_pb::bookmark);
+          specifics.bookmark();
       if (bookmark_specifics.has_title() ||
           GetTitle().empty() ||  // For the empty node case
           !GetEntry()->Get(syncable::UNIQUE_SERVER_TAG).empty()) {
         // It's possible we previously had to convert and set
         // |unencrypted_data_| but then wrote our own data, so we allow
         // |unencrypted_data_| to be non-empty.
         return specifics;
       } else {
         DCHECK_EQ(syncable::GetModelTypeFromSpecifics(unencrypted_data_),
                   syncable::BOOKMARKS);
@@ skipping 112 matching lines @@
       reinterpret_cast<const unsigned char*>(favicon.data() +
                                              favicon.length()));
 }
 
 int64 BaseNode::GetExternalId() const {
   return GetEntry()->Get(syncable::LOCAL_EXTERNAL_ID);
 }
 
 const sync_pb::AppSpecifics& BaseNode::GetAppSpecifics() const {
   DCHECK_EQ(syncable::APPS, GetModelType());
-  return GetEntitySpecifics().GetExtension(sync_pb::app);
+  return GetEntitySpecifics().app();
 }
 
 const sync_pb::AutofillSpecifics& BaseNode::GetAutofillSpecifics() const {
   DCHECK_EQ(syncable::AUTOFILL, GetModelType());
-  return GetEntitySpecifics().GetExtension(sync_pb::autofill);
+  return GetEntitySpecifics().autofill();
 }
 
 const AutofillProfileSpecifics& BaseNode::GetAutofillProfileSpecifics() const {
   DCHECK_EQ(GetModelType(), syncable::AUTOFILL_PROFILE);
-  return GetEntitySpecifics().GetExtension(sync_pb::autofill_profile);
+  return GetEntitySpecifics().autofill_profile();
 }
 
 const sync_pb::BookmarkSpecifics& BaseNode::GetBookmarkSpecifics() const {
   DCHECK_EQ(syncable::BOOKMARKS, GetModelType());
-  return GetEntitySpecifics().GetExtension(sync_pb::bookmark);
+  return GetEntitySpecifics().bookmark();
 }
 
 const sync_pb::NigoriSpecifics& BaseNode::GetNigoriSpecifics() const {
   DCHECK_EQ(syncable::NIGORI, GetModelType());
-  return GetEntitySpecifics().GetExtension(sync_pb::nigori);
+  return GetEntitySpecifics().nigori();
 }
 
 const sync_pb::PasswordSpecificsData& BaseNode::GetPasswordSpecifics() const {
   DCHECK_EQ(syncable::PASSWORDS, GetModelType());
   return *password_data_;
 }
 
 const sync_pb::ThemeSpecifics& BaseNode::GetThemeSpecifics() const {
   DCHECK_EQ(syncable::THEMES, GetModelType());
-  return GetEntitySpecifics().GetExtension(sync_pb::theme);
+  return GetEntitySpecifics().theme();
 }
 
 const sync_pb::TypedUrlSpecifics& BaseNode::GetTypedUrlSpecifics() const {
   DCHECK_EQ(syncable::TYPED_URLS, GetModelType());
-  return GetEntitySpecifics().GetExtension(sync_pb::typed_url);
+  return GetEntitySpecifics().typed_url();
 }
 
 const sync_pb::ExtensionSpecifics& BaseNode::GetExtensionSpecifics() const {
   DCHECK_EQ(syncable::EXTENSIONS, GetModelType());
-  return GetEntitySpecifics().GetExtension(sync_pb::extension);
+  return GetEntitySpecifics().extension();
 }
 
 const sync_pb::SessionSpecifics& BaseNode::GetSessionSpecifics() const {
   DCHECK_EQ(syncable::SESSIONS, GetModelType());
-  return GetEntitySpecifics().GetExtension(sync_pb::session);
+  return GetEntitySpecifics().session();
 }
 
 const sync_pb::EntitySpecifics& BaseNode::GetEntitySpecifics() const {
   return GetUnencryptedSpecifics(GetEntry());
 }
 
 syncable::ModelType BaseNode::GetModelType() const {
   return GetEntry()->GetModelType();
 }
 
 void BaseNode::SetUnencryptedSpecifics(
     const sync_pb::EntitySpecifics& specifics) {
   syncable::ModelType type = syncable::GetModelTypeFromSpecifics(specifics);
   DCHECK_NE(syncable::UNSPECIFIED, type);
   if (GetModelType() != syncable::UNSPECIFIED) {
     DCHECK_EQ(GetModelType(), type);
   }
   unencrypted_data_.CopyFrom(specifics);
 }
 
 }  // namespace sync_api