Enable Assistant for child accounts.

This reverts commit 71f820a1 ("Disable assistant for child account").

Bug: b:120075638
Test: built and tested locally
Change-Id: I59d3d4869ba596fa462a904b8a64a88230c28325
Reviewed-on: https://chromium-review.googlesource.com/c/1351155
Commit-Queue: Henrique Nazaré Santos <nazare@google.com>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613206}

ash/accelerators/accelerator_controller.cc

@@ -709,7 +709,6 @@ void HandleToggleVoiceInteraction(const ui::Accelerator& accelerator) {
     case mojom::AssistantAllowedState::DISALLOWED_BY_ARC_DISALLOWED:
     case mojom::AssistantAllowedState::DISALLOWED_BY_FLAG:
     case mojom::AssistantAllowedState::DISALLOWED_BY_SUPERVISED_USER:
-    case mojom::AssistantAllowedState::DISALLOWED_BY_CHILD_USER:
     case mojom::AssistantAllowedState::DISALLOWED_BY_INCOGNITO:
       // TODO(xiaohuic): show a specific toast.
       return;

ash/public/interfaces/voice_interaction_controller.mojom

@@ -39,8 +39,6 @@ enum AssistantAllowedState {
   DISALLOWED_BY_NONPRIMARY_USER,
   // Disallowed because current user is supervised user.
   DISALLOWED_BY_SUPERVISED_USER,
-  // Disallowed because current user is child user.
-  DISALLOWED_BY_CHILD_USER,
   // Disallowed because incognito mode.
   DISALLOWED_BY_INCOGNITO,
   // Disallowed because the device is in demo mode.

chrome/browser/chromeos/arc/arc_util.cc

@@ -627,9 +627,6 @@ ash::mojom::AssistantAllowedState IsAssistantAllowedForProfile(
   if (profile->IsLegacySupervised())
     return ash::mojom::AssistantAllowedState::DISALLOWED_BY_SUPERVISED_USER;
 
-  if (profile->IsChild())
-    return ash::mojom::AssistantAllowedState::DISALLOWED_BY_CHILD_USER;
-
   if (chromeos::switches::IsVoiceInteractionFlagsEnabled()) {
     if (!chromeos::switches::IsVoiceInteractionLocalesSupported())
       return ash::mojom::AssistantAllowedState::DISALLOWED_BY_LOCALE;

chrome/browser/chromeos/arc/arc_util_unittest.cc

@@ -28,7 +28,6 @@
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
@@ -544,18 +543,6 @@ TEST_F(ChromeArcUtilTest, IsAssistantAllowedForProfile_SupervisedUser) {
             IsAssistantAllowedForProfile(profile()));
 }
 
-TEST_F(ChromeArcUtilTest, IsAssistantAllowedForProfile_ChildUser) {
-  base::CommandLine::ForCurrentProcess()->InitFromArgv(
-      {"", "--arc-availability=officially-supported",
-       "--enable-voice-interaction"});
-  ScopedLogIn login(GetFakeUserManager(),
-                    AccountId::FromUserEmailGaiaId(
-                        profile()->GetProfileUserName(), kTestGaiaId));
-  profile()->SetSupervisedUserId(supervised_users::kChildAccountSUID);
-  EXPECT_EQ(ash::mojom::AssistantAllowedState::DISALLOWED_BY_CHILD_USER,
-            IsAssistantAllowedForProfile(profile()));
-}
-
 TEST_F(ChromeArcUtilTest, IsAssistantAllowedForProfile_Locale) {
   base::CommandLine::ForCurrentProcess()->InitFromArgv(
       {"", "--arc-availability=officially-supported",