[Sync] Add support for server-controlled favicon sync limit

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 314 matching lines @@
   return value;
 }
 
 base::DictionaryValue* DictionarySpecificsToValue(
     const sync_pb::DictionarySpecifics& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
   SET_STR(word);
   return value;
 }
 
+namespace {
+
+DictionaryValue* FaviconSyncFlagsToValue(
+    const sync_pb::FaviconSyncFlags& proto) {
+  base::DictionaryValue* value = new base::DictionaryValue();
+  SET_BOOL(enabled);
+  SET_INT32(favicon_sync_limit);
+  return value;
+}
+
+}
+
 base::DictionaryValue* ExperimentsSpecificsToValue(
     const sync_pb::ExperimentsSpecifics& proto) {
   base::DictionaryValue* value = new base::DictionaryValue();
   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);
+  if (proto.has_favicon_sync())
+    SET(favicon_sync, FaviconSyncFlagsToValue);
   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 460 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