Disable app list folders by default for non-ChromeOS platforms.

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 67eacca32f3844a164081331849c16869cc3a898..6748df4fa9ff17af8deb0ad6366ea07a1b475414 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -401,6 +401,16 @@ const Experiment::Choice kTouchScrollingModeChoices[] = {
     switches::kTouchScrollingModeSyncTouchmove },
 };
 
+#if defined(ENABLE_APP_LIST)
+const Experiment::Choice kEnableAppListFoldersChoices[] = {
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
+  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
+    app_list::switches::kEnableFolderUI, "" },
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
+    app_list::switches::kDisableFolderUI, "" },
+};
+#endif
+
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the experiment is the internal name. If you'd like to
@@ -1524,11 +1534,11 @@ const Experiment kExperiments[] = {
   },
 #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)
+    "app-list-folder-ui",
+    IDS_FLAGS_ENABLE_APP_LIST_FOLDER,
+    IDS_FLAGS_ENABLE_APP_LIST_FOLDER_DESCRIPTION,
+    kOsAll,
+    MULTI_VALUE_TYPE(kEnableAppListFoldersChoices)
   },
   {
     "disable-app-list-voice-search",