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

chrome/browser/sync/protocol/proto_value_conversions.cc

Index: chrome/browser/sync/protocol/proto_value_conversions.cc
diff --git a/chrome/browser/sync/protocol/proto_value_conversions.cc b/chrome/browser/sync/protocol/proto_value_conversions.cc
index 3885fc2e5a96f43a5d2b0913f28af5fa7e802e9f..5f0218c2b5df37689fcbcd9c261a5bc8a7f6ddf3 100644
--- a/chrome/browser/sync/protocol/proto_value_conversions.cc
+++ b/chrome/browser/sync/protocol/proto_value_conversions.cc
@@ -92,10 +92,10 @@ ListValue* MakeRepeatedValue(const F& fields, V* (*converter_fn)(T)) {
                                StringValue>(proto.field(), \
                                             Value::CreateStringValue))
 
-#define SET_EXTENSION(ns, field, fn)                                    \
+#define SET_EXTENSION(field, fn)                                    \
   do {                                                                  \
-    if (specifics.HasExtension(ns::field)) {                            \
-      value->Set(#field, fn(specifics.GetExtension(ns::field)));        \
+    if (specifics.has_##field()) {                            \
+      value->Set(#field, fn(specifics.field()));        \
     }                                                                   \
   } while (0)
 
@@ -379,21 +379,21 @@ DictionaryValue* TypedUrlSpecificsToValue(
 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_EXTENSION(app, AppSpecificsToValue);
+  SET_EXTENSION(app_notification, AppNotificationToValue);
+  SET_EXTENSION(app_setting, AppSettingSpecificsToValue);
+  SET_EXTENSION(autofill, AutofillSpecificsToValue);
+  SET_EXTENSION(autofill_profile, AutofillProfileSpecificsToValue);
+  SET_EXTENSION(bookmark, BookmarkSpecificsToValue);
+  SET_EXTENSION(extension, ExtensionSpecificsToValue);
+  SET_EXTENSION(extension_setting, ExtensionSettingSpecificsToValue);
+  SET_EXTENSION(nigori, NigoriSpecificsToValue);
+  SET_EXTENSION(password, PasswordSpecificsToValue);
+  SET_EXTENSION(preference, PreferenceSpecificsToValue);
+  SET_EXTENSION(search_engine, SearchEngineSpecificsToValue);
+  SET_EXTENSION(session, SessionSpecificsToValue);
+  SET_EXTENSION(theme, ThemeSpecificsToValue);
+  SET_EXTENSION(typed_url, TypedUrlSpecificsToValue);
   return value;
 }