sync: Add ControlPreference protobuf and supporting code

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.
 
 // Keep this file in sync with the .proto files in this directory.
 
 #include "sync/protocol/proto_value_conversions.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/app_notification_specifics.pb.h"
 #include "sync/protocol/app_setting_specifics.pb.h"
 #include "sync/protocol/app_specifics.pb.h"
 #include "sync/protocol/autofill_specifics.pb.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
+#include "sync/protocol/control_preference_specifics.pb.h"
 #include "sync/protocol/device_info_specifics.pb.h"
 #include "sync/protocol/encryption.pb.h"
 #include "sync/protocol/experiments_specifics.pb.h"
 #include "sync/protocol/extension_setting_specifics.pb.h"
 #include "sync/protocol/extension_specifics.pb.h"
 #include "sync/protocol/nigori_specifics.pb.h"
 #include "sync/protocol/password_specifics.pb.h"
 #include "sync/protocol/preference_specifics.pb.h"
 #include "sync/protocol/search_engine_specifics.pb.h"
 #include "sync/protocol/session_specifics.pb.h"
@@ skipping 13 matching lines @@
     const T& specifics(T::default_instance());
     scoped_ptr<DictionaryValue> value(specifics_to_value(specifics));
     // We can't do much but make sure that this doesn't crash.
   }
 };
 
 TEST_F(ProtoValueConversionsTest, ProtoChangeCheck) {
   // If this number changes, that means we added or removed a data
   // type.  Don't forget to add a unit test for {New
   // type}SpecificsToValue below.
-  EXPECT_EQ(20, MODEL_TYPE_COUNT);
+  EXPECT_EQ(21, MODEL_TYPE_COUNT);
 
   // We'd also like to check if we changed any field in our messages.
   // However, that's hard to do: sizeof could work, but it's
   // platform-dependent.  default_instance().ByteSize() won't change
   // for most changes, since most of our fields are optional.  So we
   // just settle for comments in the proto files.
 }
 
 TEST_F(ProtoValueConversionsTest, EncryptedDataToValue) {
   TestSpecificsToValue(EncryptedDataToValue);
@@ skipping 68 matching lines @@
   scoped_ptr<DictionaryValue> value(BookmarkSpecificsToValue(specifics));
   EXPECT_FALSE(value->empty());
   std::string encoded_time;
   EXPECT_TRUE(value->GetString("creation_time_us", &encoded_time));
   EXPECT_EQ(base::Int64ToString(creation_time.ToInternalValue()), encoded_time);
   std::string encoded_icon_url;
   EXPECT_TRUE(value->GetString("icon_url", &encoded_icon_url));
   EXPECT_EQ(icon_url, encoded_icon_url);
 }
 
+TEST_F(ProtoValueConversionsTest, ControlPreferenceSpecificsToValue) {
+  TestSpecificsToValue(ControlPreferenceSpecificsToValue);
+}
+
 TEST_F(ProtoValueConversionsTest, DeviceInfoSpecificsToValue) {
   TestSpecificsToValue(DeviceInfoSpecificsToValue);
 }
 
 TEST_F(ProtoValueConversionsTest, ExperimentsSpecificsToValue) {
   TestSpecificsToValue(ExperimentsSpecificsToValue);
 }
 
 TEST_F(ProtoValueConversionsTest, ExtensionSettingSpecificsToValue) {
   TestSpecificsToValue(ExtensionSettingSpecificsToValue);
@@ skipping 42 matching lines @@
   // 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_notification);
   SET_FIELD(app_setting);
   SET_FIELD(autofill);
   SET_FIELD(autofill_profile);
   SET_FIELD(bookmark);
+  SET_FIELD(control_preference);
   SET_FIELD(experiments);
   SET_FIELD(extension);
   SET_FIELD(extension_setting);
   SET_FIELD(history_delete_directive);
   SET_FIELD(nigori);
   SET_FIELD(password);
   SET_FIELD(device_info);
   SET_FIELD(preference);
   SET_FIELD(search_engine);
   SET_FIELD(session);
@@ skipping 64 matching lines @@
 
   scoped_ptr<DictionaryValue> value_without_specifics(
       ClientToServerResponseToValue(message, false /* include_specifics */));
   EXPECT_FALSE(value_without_specifics->empty());
   EXPECT_FALSE(ValueHasSpecifics(*(value_without_specifics.get()),
                                  "get_updates.entries"));
 }
 
 }  // namespace
 }  // namespace syncer