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

chrome/browser/search_engines/template_url_service.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/search_engines/template_url_service.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "chrome/browser/search_engines/util.h"
 #include "chrome/browser/sync/api/sync_change.h"
 #include "chrome/browser/sync/protocol/search_engine_specifics.pb.h"
+#include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/guid.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 911 matching lines @@
   SyncData sync_data = CreateSyncDataFromTemplateURL(*turl);
   changes.push_back(SyncChange(type, sync_data));
 
   sync_processor_->ProcessSyncChanges(FROM_HERE, changes);
 }
 
 // static
 SyncData TemplateURLService::CreateSyncDataFromTemplateURL(
     const TemplateURL& turl) {
   sync_pb::EntitySpecifics specifics;
-  sync_pb::SearchEngineSpecifics* se_specifics = specifics.MutableExtension(
-      sync_pb::search_engine);
+  sync_pb::SearchEngineSpecifics* se_specifics =
+      specifics.mutable_search_engine();
   se_specifics->set_short_name(UTF16ToUTF8(turl.short_name()));
   se_specifics->set_keyword(UTF16ToUTF8(turl.keyword()));
   se_specifics->set_favicon_url(turl.GetFaviconURL().spec());
   se_specifics->set_url(turl.url() ? turl.url()->url() : std::string());
   se_specifics->set_safe_for_autoreplace(turl.safe_for_autoreplace());
   se_specifics->set_originating_url(turl.originating_url().spec());
   se_specifics->set_date_created(turl.date_created().ToInternalValue());
   se_specifics->set_input_encodings(JoinString(turl.input_encodings(), ';'));
   se_specifics->set_show_in_default_list(turl.show_in_default_list());
   se_specifics->set_suggestions_url(turl.suggestions_url() ?
@@ skipping 16 matching lines @@
   UpdateTemplateURLWithSyncData(turl, sync_data);
   return turl;
 }
 
 // static
 SyncDataMap TemplateURLService::CreateGUIDToSyncDataMap(
     const SyncDataList& sync_data) {
   SyncDataMap data_map;
   SyncDataList::const_iterator iter;
   for (iter = sync_data.begin(); iter != sync_data.end(); ++iter) {
-    data_map[iter->GetSpecifics().GetExtension(
-        sync_pb::search_engine).sync_guid()] = *iter;
+    data_map[iter->GetSpecifics().search_engine().sync_guid()] = *iter;
   }
   return data_map;
 }
 
 void TemplateURLService::SetKeywordSearchTermsForURL(const TemplateURL* t_url,
                                                      const GURL& url,
                                                      const string16& term) {
   HistoryService* history = profile_  ?
       profile_->GetHistoryService(Profile::EXPLICIT_ACCESS) : NULL;
   if (!history)
@@ skipping 864 matching lines @@
         service_->UpdateKeyword(*template_url);
     }
   }
 }
 
 // static
 void TemplateURLService::UpdateTemplateURLWithSyncData(
     TemplateURL* dst,
     const SyncData& sync_data) {
   sync_pb::SearchEngineSpecifics specifics =
-      sync_data.GetSpecifics().GetExtension(sync_pb::search_engine);
+      sync_data.GetSpecifics().search_engine();
   dst->set_short_name(UTF8ToUTF16(specifics.short_name()));
   dst->set_keyword(UTF8ToUTF16(specifics.keyword()));
   dst->SetFaviconURL(GURL(specifics.favicon_url()));
   dst->SetURL(specifics.url(), 0, 0);
   dst->set_safe_for_autoreplace(specifics.safe_for_autoreplace());
   dst->set_originating_url(GURL(specifics.originating_url()));
   dst->set_date_created(
       base::Time::FromInternalValue(specifics.date_created()));
   std::vector<std::string> input_encodings;
   base::SplitString(specifics.input_encodings(), ';', &input_encodings);
   dst->set_input_encodings(input_encodings);
   dst->set_show_in_default_list(specifics.show_in_default_list());
   dst->SetSuggestionsURL(specifics.suggestions_url(), 0, 0);
   dst->SetPrepopulateId(specifics.prepopulate_id());
   dst->set_autogenerate_keyword(specifics.autogenerate_keyword());
   dst->SetInstantURL(specifics.instant_url(), 0, 0);
   dst->set_last_modified(
       base::Time::FromInternalValue(specifics.last_modified()));
   dst->set_sync_guid(specifics.sync_guid());
 }