Chrome OS: Convert kEnableDiscoverApp flag to feature.

This CL converts discover App flag to feature and enabled it by default.

Bug: 864686
Change-Id: Idf8dcce4982a16f92ed7b012525484963f799710
Reviewed-on: https://chromium-review.googlesource.com/c/1326221
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606633}

chrome/browser/about_flags.cc

@@ -4448,6 +4448,11 @@ const FeatureEntry kFeatureEntries[] = {
      kOsAll,
      FEATURE_VALUE_TYPE(data_reduction_proxy::features::
                             kDataReductionProxyEnabledWithNetworkService)},
+#if defined(OS_CHROMEOS)
+    {"discover-app", flag_descriptions::kEnableDiscoverAppName,
+     flag_descriptions::kEnableDiscoverAppDescription, kOsCrOS,
+     FEATURE_VALUE_TYPE(chromeos::features::kDiscoverApp)},
+#endif  // defined(OS_CHROMEOS)
 };
 
 class FlagsStateSingleton {

chrome/browser/flag_descriptions.cc

@@ -3230,6 +3230,10 @@ const char kEnableContinueReadingDescription[] =
     "seamlessly continue reading a web page when they switch devices from "
     "phones or tablets to Chromebooks.";
 
+const char kEnableDiscoverAppName[] = "Enable Discover App";
+const char kEnableDiscoverAppDescription[] =
+    "Enable Discover App icon in launcher.";
+
 const char kEnableDragAppsInTabletModeName[] =
     "Enable dragging apps in tablet mode";
 const char kEnableDragAppsInTabletModeDescription[] =

chrome/browser/flag_descriptions.h

@@ -1964,6 +1964,9 @@ extern const char kEnableChromeOsAccountManagerDescription[];
 extern const char kEnableContinueReadingName[];
 extern const char kEnableContinueReadingDescription[];
 
+extern const char kEnableDiscoverAppName[];
+extern const char kEnableDiscoverAppDescription[];
+
 extern const char kEnableDragAppsInTabletModeName[];
 extern const char kEnableDragAppsInTabletModeDescription[];
 

chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc

@@ -26,6 +26,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chrome_unscaled_resources.h"
 #include "chrome/grit/generated_resources.h"
+#include "chromeos/chromeos_features.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/metrics/arc_metrics_constants.h"
 #include "components/arc/property/arc_property_bridge.h"
@@ -108,8 +109,7 @@ const std::vector<InternalApp>& GetInternalAppListImpl(bool get_all,
 
   const bool add_discover_app =
       get_all || !chromeos::ProfileHelper::IsEphemeralUserProfile(profile);
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kEnableDiscoverApp) &&
+  if (base::FeatureList::IsEnabled(chromeos::features::kDiscoverApp) &&
       add_discover_app) {
     internal_app_list->push_back(
         {kInternalAppIdDiscover, IDS_INTERNAL_APP_DISCOVER,

chromeos/chromeos_features.cc

@@ -29,6 +29,11 @@ const base::Feature kChromeVoxArcSupport{"ChromeVoxArcSupport",
 const base::Feature kCrostiniUsbSupport{"CrostiniUsbSupport",
                                         base::FEATURE_DISABLED_BY_DEFAULT};
 
+// Enables or disables Discover Application on Chrome OS.
+// If enabled, Discover App will be shown in launcher.
+const base::Feature kDiscoverApp{"DiscoverApp",
+                                 base::FEATURE_ENABLED_BY_DEFAULT};
+
 // If enabled, DriveFS will be used for Drive sync.
 const base::Feature kDriveFs{"DriveFS", base::FEATURE_DISABLED_BY_DEFAULT};
 

chromeos/chromeos_features.h

@@ -20,6 +20,7 @@ CHROMEOS_EXPORT extern const base::Feature kAndroidMessagesProdEndpoint;
 CHROMEOS_EXPORT extern const base::Feature kAutoScreenBrightness;
 CHROMEOS_EXPORT extern const base::Feature kChromeVoxArcSupport;
 CHROMEOS_EXPORT extern const base::Feature kCrostiniUsbSupport;
+CHROMEOS_EXPORT extern const base::Feature kDiscoverApp;
 CHROMEOS_EXPORT extern const base::Feature kDriveFs;
 CHROMEOS_EXPORT extern const base::Feature kMyFilesVolume;
 CHROMEOS_EXPORT extern const base::Feature kEnableUnifiedMultiDeviceSettings;

chromeos/chromeos_switches.cc

@@ -321,9 +321,6 @@ const char kEnableExtensionAssetsSharing[] = "enable-extension-assets-sharing";
 // Touchscreen-specific interactions of the Files app.
 const char kEnableFileManagerTouchMode[] = "enable-file-manager-touch-mode";
 
-// Enabled Discover app.
-const char kEnableDiscoverApp[] = "enable-discover-app";
-
 // Enables animated transitions during first-run tutorial.
 const char kEnableFirstRunUITransitions[] = "enable-first-run-ui-transitions";
 

chromeos/chromeos_switches.h

@@ -92,7 +92,6 @@ CHROMEOS_EXPORT extern const char kEnableCastReceiver[];
 CHROMEOS_EXPORT extern const char kEnableChromevoxDeveloperOption[];
 CHROMEOS_EXPORT extern const char kEnableConsumerKiosk[];
 CHROMEOS_EXPORT extern const char kEnableDataSaverPrompt[];
-CHROMEOS_EXPORT extern const char kEnableDiscoverApp[];
 CHROMEOS_EXPORT extern const char kEnableEncryptionMigration[];
 CHROMEOS_EXPORT extern const char kEnableExtensionAssetsSharing[];
 CHROMEOS_EXPORT extern const char kEnableFileManagerTouchMode[];

tools/metrics/histograms/enums.xml

@@ -29692,6 +29692,7 @@ from previous Chrome versions.
   <int value="-823165021" label="MaterialDesignUserMenu:enabled"/>
   <int value="-820041355" label="enable-transition-compositing"/>
   <int value="-816984237" label="OfflinePagesAsyncDownload:enabled"/>
+  <int value="-816895294" label="DiscoverApp:disabled"/>
   <int value="-814097014" label="disable-session-crashed-bubble"/>
   <int value="-813753274" label="VrBrowsing:disabled"/>
   <int value="-813474479" label="site-per-process"/>
@@ -30408,6 +30409,7 @@ from previous Chrome versions.
   <int value="606288133" label="enable-print-preview-register-promos"/>
   <int value="606512202" label="AutofillCreditCardPopupLayout:enabled"/>
   <int value="606834606" label="force-color-profile"/>
+  <int value="606969417" label="DiscoverApp:enabled"/>
   <int value="609112512" label="touch-selection-strategy"/>
   <int value="609580715" label="ArcCupsApi:disabled"/>
   <int value="610545308" label="enable-potentially-annoying-security-features"/>