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

chrome/browser/sync/protocol/proto_value_conversions.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.
 
 // Keep this file in sync with the .proto files in this directory.
 
 #include "chrome/browser/sync/protocol/proto_value_conversions.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 74 matching lines @@
 #define SET_INT64_REP(field) SET_REP(field, MakeInt64Value)
 #define SET_STR(field) SET(field, Value::CreateStringValue)
 #define SET_STR_REP(field) \
   value->Set(#field, \
              MakeRepeatedValue<const std::string&, \
                                google::protobuf::RepeatedPtrField< \
                                    std::string >, \
                                StringValue>(proto.field(), \
                                             Value::CreateStringValue))
 
-#define SET_EXTENSION(ns, field, fn)                                    \
-  do {                                                                  \
-    if (specifics.HasExtension(ns::field)) {                            \
-      value->Set(#field, fn(specifics.GetExtension(ns::field)));        \
-    }                                                                   \
+#define SET_FIELD(field, fn)                         \
+  do {                                               \
+    if (specifics.has_##field()) {                   \
+      value->Set(#field, fn(specifics.field()));     \
+    }                                                \
   } while (0)
 
 // If you add another macro, don't forget to add an #undef at the end
 // of this file, too.
 
 DictionaryValue* EncryptedDataToValue(const sync_pb::EncryptedData& proto) {
   DictionaryValue* value = new DictionaryValue();
   SET_STR(key_name);
   // TODO(akalin): Shouldn't blob be of type bytes instead of string?
   SET_BYTES(blob);
@@ skipping 262 matching lines @@
   SET_STR(title);
   SET_BOOL(hidden);
   SET_INT64_REP(visits);
   SET_INT32_REP(visit_transitions);
   return value;
 }
 
 DictionaryValue* EntitySpecificsToValue(
     const sync_pb::EntitySpecifics& specifics) {
   DictionaryValue* value = new DictionaryValue();
-  SET_EXTENSION(sync_pb, app, AppSpecificsToValue);
-  SET_EXTENSION(sync_pb, app_notification, AppNotificationToValue);
-  SET_EXTENSION(sync_pb, app_setting, AppSettingSpecificsToValue);
-  SET_EXTENSION(sync_pb, autofill, AutofillSpecificsToValue);
-  SET_EXTENSION(sync_pb, autofill_profile, AutofillProfileSpecificsToValue);
-  SET_EXTENSION(sync_pb, bookmark, BookmarkSpecificsToValue);
-  SET_EXTENSION(sync_pb, extension, ExtensionSpecificsToValue);
-  SET_EXTENSION(sync_pb, extension_setting, ExtensionSettingSpecificsToValue);
-  SET_EXTENSION(sync_pb, nigori, NigoriSpecificsToValue);
-  SET_EXTENSION(sync_pb, password, PasswordSpecificsToValue);
-  SET_EXTENSION(sync_pb, preference, PreferenceSpecificsToValue);
-  SET_EXTENSION(sync_pb, search_engine, SearchEngineSpecificsToValue);
-  SET_EXTENSION(sync_pb, session, SessionSpecificsToValue);
-  SET_EXTENSION(sync_pb, theme, ThemeSpecificsToValue);
-  SET_EXTENSION(sync_pb, typed_url, TypedUrlSpecificsToValue);
+  SET_FIELD(app, AppSpecificsToValue);
+  SET_FIELD(app_notification, AppNotificationToValue);
+  SET_FIELD(app_setting, AppSettingSpecificsToValue);
+  SET_FIELD(autofill, AutofillSpecificsToValue);
+  SET_FIELD(autofill_profile, AutofillProfileSpecificsToValue);
+  SET_FIELD(bookmark, BookmarkSpecificsToValue);
+  SET_FIELD(extension, ExtensionSpecificsToValue);
+  SET_FIELD(extension_setting, ExtensionSettingSpecificsToValue);
+  SET_FIELD(nigori, NigoriSpecificsToValue);
+  SET_FIELD(password, PasswordSpecificsToValue);
+  SET_FIELD(preference, PreferenceSpecificsToValue);
+  SET_FIELD(search_engine, SearchEngineSpecificsToValue);
+  SET_FIELD(session, SessionSpecificsToValue);
+  SET_FIELD(theme, ThemeSpecificsToValue);
+  SET_FIELD(typed_url, TypedUrlSpecificsToValue);
   return value;
 }
 
 #undef SET
 #undef SET_REP
 
 #undef SET_BOOL
 #undef SET_BYTES
 #undef SET_INT32
 #undef SET_INT64
 #undef SET_INT64_REP
 #undef SET_STR
 #undef SET_STR_REP
 
-#undef SET_EXTENSION
+#undef SET_FIELD
 
 }  // namespace browser_sync