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

chrome/browser/webdata/autofill_profile_syncable_service_unittest.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 "base/location.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/sync/internal_api/read_node_mock.h"
 #include "chrome/browser/sync/internal_api/syncapi_mock.h"
@@ skipping 39 matching lines @@
 MATCHER_P(CheckSyncChanges, n_sync_changes_list, "") {
   if (arg.size() != n_sync_changes_list.size())
     return false;
   SyncChangeList::const_iterator passed, expected;
   for (passed = arg.begin(), expected = n_sync_changes_list.begin();
        passed != arg.end() && expected != n_sync_changes_list.end();
        ++passed, ++expected) {
     DCHECK(passed->IsValid());
     if (passed->change_type() != expected->change_type())
       return false;
-    if (passed->sync_data().GetSpecifics().GetExtension(
-            sync_pb::autofill_profile).guid() !=
-        expected->sync_data().GetSpecifics().GetExtension(
-            sync_pb::autofill_profile).guid()) {
+    if (passed->sync_data().GetSpecifics().autofill_profile().guid() !=
+        expected->sync_data().GetSpecifics().autofill_profile().guid()) {
       return false;
     }
   }
   return true;
 }
 
 MATCHER_P(DataBundleCheck, n_bundle, "") {
   if ((arg.profiles_to_delete.size() != n_bundle.profiles_to_delete.size()) ||
       (arg.profiles_to_update.size() != n_bundle.profiles_to_update.size()) ||
       (arg.profiles_to_add.size() != n_bundle.profiles_to_add.size())) {
@@ skipping 129 matching lines @@
   SyncDataList data_list;
   // Takes ownership of sync_processor_.
   autofill_syncable_service_.MergeDataAndStartSyncing(
       syncable::AUTOFILL_PROFILE, data_list, sync_processor_.release());
 
   SyncDataList data =
       autofill_syncable_service_.GetAllSyncData(syncable::AUTOFILL_PROFILE);
 
   EXPECT_EQ(2U, data.size());
   EXPECT_EQ(guid_present1, data.front().GetSpecifics()
-                               .GetExtension(sync_pb::autofill_profile).guid());
+            .autofill_profile().guid());

[akalin, 2012/03/02 23:56:49]

indentation

   EXPECT_EQ(guid_present2, data.back().GetSpecifics()
-                               .GetExtension(sync_pb::autofill_profile).guid());
+                               .autofill_profile().guid());
 }
 
 TEST_F(AutofillProfileSyncableServiceTest, ProcessSyncChanges) {
   std::vector<AutofillProfile *> profiles_from_web_db;
   std::string guid_present = kGuid1;
   std::string guid_synced = kGuid2;
 
   SyncChangeList change_list;
   AutofillProfile profile(guid_synced);
   profile.SetInfo(NAME_FIRST, UTF8ToUTF16("Jane"));
@@ skipping 176 matching lines @@
   profile1.GetMultiInfo(EMAIL_ADDRESS, &values);
   ASSERT_EQ(values.size(), 3U);
   EXPECT_EQ(values[0], UTF8ToUTF16("1@1.com"));
   EXPECT_EQ(values[1], UTF8ToUTF16("2@1.com"));
   EXPECT_EQ(values[2], UTF8ToUTF16("3@1.com"));
 
   profile1.GetMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
   ASSERT_EQ(values.size(), 1U);
   EXPECT_EQ(values[0], UTF8ToUTF16("650234567"));
 }