[Sync] Add favicon sync experiment

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 24690e970bd622cf67f8d420334cd853baf6819b..8db6c45147ae61091329314f68ad894c34dfaab5 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -958,18 +958,6 @@ void ProfileSyncService::OnExperimentsChanged(
   }
 
   // Now enable any non-datatype features.
-  if (experiments.sync_tab_favicons) {
-    DVLOG(1) << "Enabling syncing of tab favicons.";
-    about_flags::SetExperimentEnabled(g_browser_process->local_state(),
-                                      "sync-tab-favicons",
-                                      true);
-#if defined(OS_ANDROID)
-    // Android does not support about:flags and experiments, so we need to force
-    // setting the experiments as command line switches.
-    CommandLine::ForCurrentProcess()->AppendSwitch(switches::kSyncTabFavicons);
-#endif
-  }
-
   if (experiments.keystore_encryption) {
     about_flags::SetExperimentEnabled(g_browser_process->local_state(),
                                       syncer::kKeystoreEncryptionFlag,
@@ -982,6 +970,12 @@ void ProfileSyncService::OnExperimentsChanged(
                                       true);
   }
 
+  if (experiments.favicon_sync) {
+    about_flags::SetExperimentEnabled(g_browser_process->local_state(),
+                                      syncer::kFaviconSyncFlag,
+                                      true);
+  }
+
   current_experiments_ = experiments;
 }