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

chrome/browser/sync/engine/apply_updates_command_unittest.cc

Index: chrome/browser/sync/engine/apply_updates_command_unittest.cc
diff --git a/chrome/browser/sync/engine/apply_updates_command_unittest.cc b/chrome/browser/sync/engine/apply_updates_command_unittest.cc
index 40d9df1a0fc5be5ad480c50d3ed45a3f1d978693..2d8a15f7da31095ecf53fc65bc0073472305cae4 100644
--- a/chrome/browser/sync/engine/apply_updates_command_unittest.cc
+++ b/chrome/browser/sync/engine/apply_updates_command_unittest.cc
@@ -565,7 +565,7 @@ TEST_F(ApplyUpdatesCommandTest, DecryptablePassword) {
   data.set_origin("http://example.com");
 
   cryptographer->Encrypt(data,
-      specifics.MutableExtension(sync_pb::password)->mutable_encrypted());
+                         specifics.mutable_password()->mutable_encrypted());
   CreateUnappliedNewItem("item", specifics, false);
 
   ExpectGroupToChange(apply_updates_command_, GROUP_PASSWORD);
@@ -594,7 +594,7 @@ TEST_F(ApplyUpdatesCommandTest, UndecryptableData) {
                                    root_server_id);
   CreateUnappliedNewItem("item2", encrypted_bookmark, false);
   sync_pb::EntitySpecifics encrypted_password;
-  encrypted_password.MutableExtension(sync_pb::password);
+  encrypted_password.mutable_password();
   CreateUnappliedNewItem("item3", encrypted_password, false);
 
   ExpectGroupsToChange(apply_updates_command_, GROUP_UI, GROUP_PASSWORD);
@@ -653,7 +653,7 @@ TEST_F(ApplyUpdatesCommandTest, SomeUndecryptablePassword) {
       cryptographer->AddKey(params);
 
       cryptographer->Encrypt(data,
-          specifics.MutableExtension(sync_pb::password)->mutable_encrypted());
+          specifics.mutable_password()->mutable_encrypted());
     }
     CreateUnappliedNewItem("item1", specifics, false);
   }
@@ -668,7 +668,7 @@ TEST_F(ApplyUpdatesCommandTest, SomeUndecryptablePassword) {
     data.set_origin("http://example.com/2");
 
     cryptographer.Encrypt(data,
-        specifics.MutableExtension(sync_pb::password)->mutable_encrypted());
+        specifics.mutable_password()->mutable_encrypted());
     CreateUnappliedNewItem("item2", specifics, false);
   }
 
@@ -718,8 +718,7 @@ TEST_F(ApplyUpdatesCommandTest, NigoriUpdate) {
   other_cryptographer.AddKey(params);
 
   sync_pb::EntitySpecifics specifics;
-  sync_pb::NigoriSpecifics* nigori =
-      specifics.MutableExtension(sync_pb::nigori);
+  sync_pb::NigoriSpecifics* nigori = specifics.mutable_nigori();
   other_cryptographer.GetKeys(nigori->mutable_encrypted());
   nigori->set_encrypt_bookmarks(true);
   encrypted_types.Put(syncable::BOOKMARKS);
@@ -770,8 +769,7 @@ TEST_F(ApplyUpdatesCommandTest, NigoriUpdateForDisabledTypes) {
   other_cryptographer.AddKey(params);
 
   sync_pb::EntitySpecifics specifics;
-  sync_pb::NigoriSpecifics* nigori =
-      specifics.MutableExtension(sync_pb::nigori);
+  sync_pb::NigoriSpecifics* nigori = specifics.mutable_nigori();
   other_cryptographer.GetKeys(nigori->mutable_encrypted());
   nigori->set_encrypt_sessions(true);
   nigori->set_encrypt_themes(true);
@@ -849,8 +847,7 @@ TEST_F(ApplyUpdatesCommandTest, EncryptUnsyncedChanges) {
   KeyParams params = {"localhost", "dummy", "foobar"};
   cryptographer->AddKey(params);
   sync_pb::EntitySpecifics specifics;
-  sync_pb::NigoriSpecifics* nigori =
-      specifics.MutableExtension(sync_pb::nigori);
+  sync_pb::NigoriSpecifics* nigori = specifics.mutable_nigori();
   cryptographer->GetKeys(nigori->mutable_encrypted());
   nigori->set_encrypt_bookmarks(true);
   encrypted_types.Put(syncable::BOOKMARKS);
@@ -954,8 +951,7 @@ TEST_F(ApplyUpdatesCommandTest, CannotEncryptUnsyncedChanges) {
   KeyParams params = {"localhost", "dummy", "foobar"};
   other_cryptographer.AddKey(params);
   sync_pb::EntitySpecifics specifics;
-  sync_pb::NigoriSpecifics* nigori =
-      specifics.MutableExtension(sync_pb::nigori);
+  sync_pb::NigoriSpecifics* nigori = specifics.mutable_nigori();
   other_cryptographer.GetKeys(nigori->mutable_encrypted());
   nigori->set_encrypt_bookmarks(true);
   encrypted_types.Put(syncable::BOOKMARKS);