Add kEduCoexistence flag for Project Beaker on Chrome OS

Change-Id: I8b16f6c73bfcba4271c571db36846b8ea43f3e92
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1864685
Commit-Queue: Anastasiia Nikolaienko <anastasiian@chromium.org>
Reviewed-by: Kush Sinha <sinhak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707851}

chrome/browser/about_flags.cc

@@ -4413,6 +4413,12 @@ const FeatureEntry kFeatureEntries[] = {
      SINGLE_VALUE_TYPE(
          previews::switches::kEnableDeferAllScriptWithoutOptimizationHints)},
 
+#if defined(OS_CHROMEOS)
+    {"enable-edu-coexistence", flag_descriptions::kEnableEduCoexistenceName,
+     flag_descriptions::kEnableEduCoexistenceDescription, kOsCrOS,
+     FEATURE_VALUE_TYPE(chromeos::features::kEduCoexistence)},
+#endif  // OS_CHROMEOS
+
 #if defined(OS_CHROMEOS)
     {"enable-assistant-routines",
      flag_descriptions::kEnableAssistantRoutinesName,

chrome/browser/flag-metadata.json

@@ -1195,6 +1195,11 @@
     "owners": [ "//third_party/blink/renderer/core/display_lock/OWNERS" ],
     "expiry_milestone": 80
   },
+  {
+    "name": "enable-edu-coexistence",
+    "owners": [ "anastasiian@chromium.org", "sinhak@chromium.org" ],
+    "expiry_milestone": 83
+  },
   {
     "name": "enable-encryption-migration",
     "owners": [ "fukino" ],

chrome/browser/flag_descriptions.cc

@@ -597,6 +597,11 @@ const char kEnableDeferAllScriptWithoutOptimizationHintsDescription[] =
     "that the ECT trigger threshold is set to 4G (which is otherwise provided "
     "by the optimization hints). Rest of the checks are still executed.";
 
+extern const char kEnableEduCoexistenceName[] =
+    "Enable Family Link managed accounts and EDU accounts coexistence";
+extern const char kEnableEduCoexistenceDescription[] =
+    "Allows Family Link managed users to add secondary EDU accounts.";
+
 const char kEnableSaveDataName[] = "Enables save data feature";
 const char kEnableSaveDataDescription[] =
     "Enables save data feature. May cause user's traffic to be proxied via "

chrome/browser/flag_descriptions.h

@@ -365,6 +365,9 @@ extern const char kEnableDeferAllScriptDescription[];
 extern const char kEnableDeferAllScriptWithoutOptimizationHintsName[];
 extern const char kEnableDeferAllScriptWithoutOptimizationHintsDescription[];
 
+extern const char kEnableEduCoexistenceName[];
+extern const char kEnableEduCoexistenceDescription[];
+
 extern const char kEnableSaveDataName[];
 extern const char kEnableSaveDataDescription[];
 

chromeos/constants/chromeos_features.cc

@@ -85,6 +85,10 @@ const base::Feature kDriveFs{"DriveFS", base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kDriveFsMirroring{"DriveFsMirroring",
                                       base::FEATURE_DISABLED_BY_DEFAULT};
 
+// If enabled, allows Unicorn users to add secondary EDU accounts.
+const base::Feature kEduCoexistence{"EduCoexistence",
+                                    base::FEATURE_DISABLED_BY_DEFAULT};
+
 // If enabled shows the visual signals feedback panel.
 const base::Feature kEnableFileManagerFeedbackPanel{
     "EnableFeedbackPanel", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -254,6 +258,10 @@ bool IsAmbientModeEnabled() {
   return base::FeatureList::IsEnabled(kAmbientModeFeature);
 }
 
+bool IsEduCoexistenceEnabled() {
+  return base::FeatureList::IsEnabled(kEduCoexistence);
+}
+
 bool IsImeDecoderWithSandboxEnabled() {
   return base::FeatureList::IsEnabled(kImeDecoderWithSandbox);
 }

chromeos/constants/chromeos_features.h

@@ -49,6 +49,8 @@ extern const base::Feature kDriveFsMirroring;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kEolWarningNotifications;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
+extern const base::Feature kEduCoexistence;
+COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kEnableFileManagerFeedbackPanel;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kEnableFileManagerPiexWasm;
@@ -118,6 +120,7 @@ extern const base::Feature kVideoPlayerNativeControls;
 
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsAmbientModeEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsAssistantEnabled();
+COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsEduCoexistenceEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsImeDecoderWithSandboxEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 bool IsInstantTetheringBackgroundAdvertisingSupported();

tools/metrics/histograms/enums.xml

@@ -36870,6 +36870,7 @@ from previous Chrome versions.
   <int value="-22544408" label="enable-video-player-chromecast-support"/>
   <int value="-20597579" label="UseMultiloginEndpoint:enabled"/>
   <int value="-20438829" label="SyncUSSAutofillProfile:enabled"/>
+  <int value="-20329017" label="EduCoexistence:disabled"/>
   <int value="-20267582" label="ResourceLoadingHints:disabled"/>
   <int value="-18464041" label="AutofillPrefilledFields:disabled"/>
   <int value="-17698200" label="DoubleTapToZoomInTabletMode:disabled"/>
@@ -37916,6 +37917,7 @@ from previous Chrome versions.
   <int value="1379571437" label="ExoPointerLock:disabled"/>
   <int value="1379944457" label="EnableMessagesWebPush:disabled"/>
   <int value="1381746642" label="enable-automatic-password-saving"/>
+  <int value="1381817717" label="EduCoexistence:enabled"/>
   <int value="1382107019" label="LevelDBPerformRewrite:disabled"/>
   <int value="1382500494" label="disable-drive-apps-in-app-list"/>
   <int value="1383591631" label="enable-gesture-typing"/>