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

chrome/browser/extensions/extension_sync_data.cc

 // Copyright (c) 2011 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/extensions/extension_sync_data.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/sync/protocol/app_specifics.pb.h"
 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"
+#include "chrome/browser/sync/protocol/sync.pb.h"
 
 ExtensionSyncData::ExtensionSyncData()
     : uninstalled_(false),
       enabled_(false),
       incognito_enabled_(false),
       type_(Extension::SYNC_TYPE_NONE),
       notifications_disabled_(false) {
 }
 
 ExtensionSyncData::ExtensionSyncData(const SyncData& sync_data)
@@ skipping 64 matching lines @@
   specifics->set_enabled(enabled_);
   specifics->set_incognito_enabled(incognito_enabled_);
   specifics->set_name(name_);
 }
 
 SyncData ExtensionSyncData::GetSyncData() const {
   sync_pb::EntitySpecifics specifics;
 
   switch (type_) {
     case Extension::SYNC_TYPE_EXTENSION:
-      PopulateExtensionSpecifics(specifics.MutableExtension(
-          sync_pb::extension));
+      PopulateExtensionSpecifics(specifics.mutable_extension());
       break;
     case Extension::SYNC_TYPE_APP:
-      PopulateAppSpecifics(specifics.MutableExtension(sync_pb::app));
+      PopulateAppSpecifics(specifics.mutable_app());
       break;
     default:
       LOG(FATAL) << "Attempt to get non-syncable data.";
   }
 
   return SyncData::CreateLocalData(id_, name_, specifics);
 }
 
 SyncChange ExtensionSyncData::GetSyncChange(
     SyncChange::SyncChangeType change_type) const {
@@ skipping 39 matching lines @@
   update_url_ = specifics_update_url;
   version_ = specifics_version;
   enabled_ = specifics.enabled();
   incognito_enabled_ = specifics.incognito_enabled();
   name_ = specifics.name();
 }
 
 void ExtensionSyncData::PopulateFromSyncData(const SyncData& sync_data) {
   const sync_pb::EntitySpecifics& entity_specifics = sync_data.GetSpecifics();
 
-  if (entity_specifics.HasExtension(sync_pb::extension)) {
-    PopulateFromExtensionSpecifics(
-        entity_specifics.GetExtension(sync_pb::extension));
+  if (entity_specifics.has_extension()) {
+    PopulateFromExtensionSpecifics(entity_specifics.extension());
     type_ = Extension::SYNC_TYPE_EXTENSION;
-  } else if (entity_specifics.HasExtension(sync_pb::app)) {
-    PopulateFromAppSpecifics(
-        entity_specifics.GetExtension(sync_pb::app));
+  } else if (entity_specifics.has_app()) {
+    PopulateFromAppSpecifics(entity_specifics.app());
     type_ = Extension::SYNC_TYPE_APP;
   } else {
     LOG(FATAL) << "Attempt to sync bad EntitySpecifics.";
   }
 }