[Sync] Wrap model type specifics in oneof.

components/sync/protocol/proto_value_conversions_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 "components/sync/protocol/proto_value_conversions.h"
 
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
@@ skipping 333 matching lines @@
 
 TEST_F(ProtoValueConversionsTest, ArticleSpecificsToValue) {
   TestSpecificsToValue(ArticleSpecificsToValue);
 }
 
 TEST_F(ProtoValueConversionsTest, WifiCredentialSpecificsToValue) {
   TestSpecificsToValue(WifiCredentialSpecificsToValue);
 }
 
 // TODO(akalin): Figure out how to better test EntitySpecificsToValue.
-
-TEST_F(ProtoValueConversionsTest, EntitySpecificsToValue) {
+// TODO(skym): Rework this case. It is no longer valid to set multiple fields.

[bartekg, 2017/01/24 19:19:39]

Maybe there is a way to turn this into a parameterized test? Using lite proto
runtime makes it tricky.

One way would be to use a field id as a parameter, generate serialized protos,
parse them and discard unrecognized fields.

+/*TEST_F(ProtoValueConversionsTest, EntitySpecificsToValue) {
   sync_pb::EntitySpecifics specifics;
 // Touch the extensions to make sure it shows up in the generated
 // value.
 #define SET_FIELD(key) (void)specifics.mutable_##key()
 
   SET_FIELD(app);
   SET_FIELD(app_list);
   SET_FIELD(app_notification);
   SET_FIELD(app_setting);
   SET_FIELD(arc_package);
@@ skipping 29 matching lines @@
   SET_FIELD(autofill_wallet);
   SET_FIELD(wallet_metadata);
 
 #undef SET_FIELD
 
   std::unique_ptr<base::DictionaryValue> value(
       EntitySpecificsToValue(specifics));
   EXPECT_EQ(MODEL_TYPE_COUNT - FIRST_REAL_MODEL_TYPE -
                 (LAST_PROXY_TYPE - FIRST_PROXY_TYPE + 1),
             static_cast<int>(value->size()));
-}
+}*/
 
 TEST_F(ProtoValueConversionsTest, UniquePositionToValue) {
   sync_pb::SyncEntity entity;
   entity.mutable_unique_position()->set_custom_compressed_v1("test");
 
   auto value = SyncEntityToValue(entity, false);
   std::string unique_position;
   EXPECT_TRUE(value->GetString("unique_position", &unique_position));
 
   std::string expected_unique_position =
@@ skipping 72 matching lines @@
   EXPECT_FALSE(ValueHasSpecifics(*(value_without_specifics.get()),
                                  "get_updates.entries"));
 }
 
 TEST_F(ProtoValueConversionsTest, AttachmentIdProtoToValue) {
   TestSpecificsToValue(AttachmentIdProtoToValue);
 }
 
 }  // namespace
 }  // namespace syncer