Disable AppList sync by default on non Chrome OS

chrome/browser/about_flags.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 "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 383 matching lines @@
     switches::kTouchScrollingMode,
     switches::kTouchScrollingModeTouchcancel },
   { IDS_FLAGS_TOUCH_SCROLLING_MODE_ABSORB_TOUCHMOVE,
     switches::kTouchScrollingMode,
     switches::kTouchScrollingModeAbsorbTouchmove },
   { IDS_FLAGS_TOUCH_SCROLLING_MODE_SYNC_TOUCHMOVE,
     switches::kTouchScrollingMode,
     switches::kTouchScrollingModeSyncTouchmove },
 };
 
+#if defined(ENABLE_APP_LIST)
+const Experiment::Choice kEnableSyncAppListChoices[] = {
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
+  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
+    app_list::switches::kEnableSyncAppList, "" },
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
+    app_list::switches::kDisableSyncAppList, "" },
+};
+#endif
+
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the experiment is the internal name. If you'd like to
 // gather statistics about the usage of your flag, you should append a marker
 // comment to the end of the feature name, like so:
 //   "my-special-feature",  // FLAGS:RECORD_UMA
 //
 // After doing that, run
 //   tools/metrics/actions/extract_actions.py
 // to add the metric to actions.xml (which will enable UMA to record your
@@ skipping 790 matching lines @@
   {
     "enable-sync-synced-notifications",
     IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME,
     IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION,
     kOsDesktop,
     ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications,
                               switches::kDisableSyncSyncedNotifications)
   },
 #if defined(ENABLE_APP_LIST)
   {
-    "disable-sync-app-list",
-    IDS_FLAGS_DISABLE_SYNC_APP_LIST_NAME,
-    IDS_FLAGS_DISABLE_SYNC_APP_LIST_DESCRIPTION,
+    "enable-sync-app-list",
+    IDS_FLAGS_ENABLE_SYNC_APP_LIST_NAME,
+    IDS_FLAGS_ENABLE_SYNC_APP_LIST_DESCRIPTION,
     kOsDesktop,
-    SINGLE_VALUE_TYPE(switches::kDisableSyncAppList)
+    MULTI_VALUE_TYPE(kEnableSyncAppListChoices)
   },
 #endif
   {
     "enable-usermedia-screen-capture",
     IDS_FLAGS_ENABLE_SCREEN_CAPTURE_NAME,
     IDS_FLAGS_ENABLE_SCREEN_CAPTURE_DESCRIPTION,
     kOsDesktop,
     SINGLE_VALUE_TYPE(switches::kEnableUserMediaScreenCapturing)
   },
 #if defined(OS_MACOSX)
@@ skipping 277 matching lines @@
     // visible on Win/Mac/CrOS but not on Linux GTK, which would be confusing.
     // TODO(mgiuca): Remove the #if when Aura is the default on Linux.
     "enable-app-list",
     IDS_FLAGS_ENABLE_APP_LIST_NAME,
     IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION,
     kOsLinux,
     SINGLE_VALUE_TYPE(switches::kEnableAppList)
   },
 #endif
   {
-    "disable-app-list-folder-ui",
-    IDS_FLAGS_DISABLE_APP_LIST_FOLDER,
-    IDS_FLAGS_DISABLE_APP_LIST_FOLDER_DESCRIPTION,
-    kOsWin | kOsLinux | kOsCrOS,
-    SINGLE_VALUE_TYPE(app_list::switches::kDisableFolderUI)
-  },
-  {
     "disable-app-list-voice-search",
     IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH,
     IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION,
     kOsCrOS,
     SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch)
   },
   {
     "enable-app-list-hotword-always-on",
     IDS_FLAGS_ENABLE_APP_LIST_HOTWORD_ALWAYS_ON,
     IDS_FLAGS_ENABLE_APP_LIST_HOTWORD_ALWAYS_ON_DESCRIPTION,
@@ skipping 822 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags