[Sync] Add favicon sync experiment

sync/protocol/proto_value_conversions.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/base64.h"
 #include "base/basictypes.h"
@@ skipping 87 matching lines @@
 #define SET_INT64(field) SET(field, MakeInt64Value)
 #define SET_INT64_REP(field) SET_REP(field, MakeInt64Value)
 #define SET_STR(field) SET(field, new base::StringValue)
 #define SET_STR_REP(field) \
   value->Set(#field, \
              MakeRepeatedValue<const std::string&, \
                                google::protobuf::RepeatedPtrField< \
                                    std::string >, \
                                base::StringValue>(proto.field(), \
                                             MakeStringValue))
+#define SET_EXPERIMENT_ENABLED_FIELD(field)          \
+  do {                                               \
+    if (proto.has_##field() &&                       \
+        proto.field().has_enabled()) {             \

[rlarocque, 2013/03/18 18:48:11]

nit: align slashes.

[Nicolas Zea, 2013/03/18 19:12:18]

Done.

+      value->Set(#field,                             \
+                 new base::FundamentalValue(         \
+                     proto.field().enabled()));    \
+    }                                                \
+  } while (0)
 
 #define SET_FIELD(field, fn)                         \
   do {                                               \
     if (specifics.has_##field()) {                   \
       value->Set(#field, fn(specifics.field()));     \
     }                                                \
   } while (0)
 
 // If you add another macro, don't forget to add an #undef at the end
 // of this file, too.
@@ skipping 83 matching lines @@
   SET_STR(username_value);
   SET_STR(password_element);
   value->SetString("password_value", "<redacted>");
   SET_BOOL(ssl_valid);
   SET_BOOL(preferred);
   SET_INT64(date_created);
   SET_BOOL(blacklisted);
   return value;
 }
 
-base::DictionaryValue* KeystoreEncryptionFlagsToValue(
-    const sync_pb::KeystoreEncryptionFlags& proto) {
-  base::DictionaryValue* value = new base::DictionaryValue();
-  SET_BOOL(enabled);
-  return value;
-}
-
 base::DictionaryValue* GlobalIdDirectiveToValue(
     const sync_pb::GlobalIdDirective& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
   SET_INT64_REP(global_id);
   SET_INT64(start_time_usec);
   SET_INT64(end_time_usec);
   return value;
 }
 
 base::DictionaryValue* TimeRangeDirectiveToValue(
@@ skipping 104 matching lines @@
 base::DictionaryValue* DictionarySpecificsToValue(
     const sync_pb::DictionarySpecifics& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
   SET_STR(word);
   return value;
 }
 
 base::DictionaryValue* ExperimentsSpecificsToValue(
     const sync_pb::ExperimentsSpecifics& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
-  SET(keystore_encryption, KeystoreEncryptionFlagsToValue);
+  SET_EXPERIMENT_ENABLED_FIELD(keystore_encryption);
+  SET_EXPERIMENT_ENABLED_FIELD(history_delete_directives);
+  SET_EXPERIMENT_ENABLED_FIELD(autofill_culling);
+  SET_EXPERIMENT_ENABLED_FIELD(favicon_sync);
   return value;
 }
 
 base::DictionaryValue* ExtensionSettingSpecificsToValue(
     const sync_pb::ExtensionSettingSpecifics& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
   SET_STR(extension_id);
   SET_STR(key);
   SET_STR(value);
   return value;
@@ skipping 437 matching lines @@
 #undef SET_BYTES
 #undef SET_INT32
 #undef SET_INT64
 #undef SET_INT64_REP
 #undef SET_STR
 #undef SET_STR_REP
 
 #undef SET_FIELD
 
 }  // namespace syncer