Quick Answers: Clean up settings sub-toggle feature flag

Bug: b/159670857
Test: Run existing tests
Change-Id: I93e809c9f96e8a8c705cc43b144ecf2ae4d86625
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518724Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Jeroen Dhollander <jeroendh@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Yue Li <updowndota@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825892}

chrome/browser/ui/webui/settings/chromeos/search_section.cc

@@ -311,22 +311,8 @@ bool SearchSection::IsAssistantAllowed() const {
 }
 
 bool SearchSection::IsQuickAnswersAllowed() const {
-  if (!features::IsQuickAnswersSettingToggleEnabled())
-    return false;
-
-  const PrefService* prefs = profile()->GetPrefs();
-  std::string pref_locale =
-      prefs->GetString(language::prefs::kApplicationLocale);
-  // Also accept runtime locale which maybe an approximation of user's pref
-  // locale.
-  const std::string kRuntimeLocale = icu::Locale::getDefault().getName();
-
-  base::ReplaceChars(pref_locale, "-", "_", &pref_locale);
-  if (!::chromeos::quick_answers::QuickAnswersClient::
-          IsQuickAnswersAllowedForLocale(pref_locale, kRuntimeLocale))
-    return false;
-
-  return true;
+  // TODO(b/159670857): Clean up Quick Answer settings toggle.
+  return false;
 }
 
 void SearchSection::UpdateAssistantSearchTags() {

chromeos/components/quick_answers/quick_answers_client.cc

@@ -134,8 +134,6 @@ void QuickAnswersClient::NotifyEligibilityChanged() {
   bool is_eligible =
       (chromeos::features::IsQuickAnswersEnabled() && assistant_state_ &&
        assistant_enabled_ && locale_supported_ && assistant_context_enabled_ &&
-       (!chromeos::features::IsQuickAnswersSettingToggleEnabled() ||
-        quick_answers_settings_enabled_) &&
        assistant_allowed_state_ ==
            chromeos::assistant::AssistantAllowedState::ALLOWED);
 

chromeos/components/quick_answers/quick_answers_client_unittest.cc

@@ -153,10 +153,7 @@ class QuickAnswersClientTest : public testing::Test {
 
 TEST_F(QuickAnswersClientTest, FeatureEligible) {
   base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitWithFeatures(
-      {chromeos::features::kQuickAnswers,
-       chromeos::features::kQuickAnswersSubToggle},
-      {});
+  scoped_feature_list.InitAndEnableFeature(chromeos::features::kQuickAnswers);
 
   // Verify that OnEligibilityChanged is called.
   EXPECT_CALL(*mock_delegate_, OnEligibilityChanged(false)).Times(0);
@@ -271,23 +268,6 @@ TEST_F(QuickAnswersClientTest, UnsupportedLocale) {
       /*locale=*/"en-GB");
 }
 
-TEST_F(QuickAnswersClientTest, SettingToggleDisabled) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitWithFeatures(
-      {chromeos::features::kQuickAnswersSubToggle}, {});
-
-  // Verify that OnEligibilityChanged is called.
-  EXPECT_CALL(*mock_delegate_, OnEligibilityChanged(false)).Times(0);
-  EXPECT_CALL(*mock_delegate_, OnEligibilityChanged(true)).Times(0);
-
-  NotifyAssistantStateChange(
-      /*setting_enabled=*/true,
-      /*context_enabled=*/true,
-      /*quick_answers_enabled=*/false,
-      /*assistant_state=*/chromeos::assistant::AssistantAllowedState::ALLOWED,
-      /*locale=*/"en-US");
-}
-
 TEST_F(QuickAnswersClientTest, NetworkError) {
   // Verify that OnNetworkError is called.
   EXPECT_CALL(*mock_delegate_, OnNetworkError());

chromeos/constants/chromeos_features.cc

@@ -483,10 +483,6 @@ const base::Feature kQuickAnswersDogfood{"QuickAnswersDogfood",
 const base::Feature kQuickAnswersTextAnnotator{
     "QuickAnswersTextAnnotator", base::FEATURE_DISABLED_BY_DEFAULT};
 
-// Controls whether to enable quick answers setting sub toggle.
-const base::Feature kQuickAnswersSubToggle{"QuickAnswersSubToggle",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
-
 // Controls whether to enable quick answers translation.
 const base::Feature kQuickAnswersTranslation{"QuickAnswersTranslation",
                                              base::FEATURE_DISABLED_BY_DEFAULT};
@@ -753,11 +749,6 @@ bool IsQuickAnswersEnabled() {
   return base::FeatureList::IsEnabled(kQuickAnswers);
 }
 
-bool IsQuickAnswersSettingToggleEnabled() {
-  return IsQuickAnswersEnabled() &&
-         base::FeatureList::IsEnabled(kQuickAnswersSubToggle);
-}
-
 bool IsQuickAnswersTextAnnotatorEnabled() {
   return base::FeatureList::IsEnabled(kQuickAnswersTextAnnotator);
 }