Add flag to disable voice match for ART tests

ART tests does not support voice match, this cl introduces a new feature
flag to disable voice match so that the ART tests could use hotword
without VM.

Bug: b/142060062
Test: Manual Test
Change-Id: Iccc22ca6dc1536d85041a4178c021a7c3f7e5a45
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1846471
Commit-Queue: Yue Li <updowndota@chromium.org>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703935}

chrome/browser/resources/chromeos/assistant_optin/assistant_optin_flow.js

@@ -82,6 +82,7 @@ Polymer({
    */
   reloadContent: function(data) {
     this.voiceMatchEnforcedOff = data['voiceMatchEnforcedOff'];
+    this.voiceMatchDisabled = loadTimeData.getBoolean('voiceMatchDisabled');
     data['flowType'] = this.flowType;
     this.$['value-prop'].reloadContent(data);
     this.$['third-party'].reloadContent(data);
@@ -118,7 +119,7 @@ Polymer({
         this.showScreen(this.$['third-party']);
         break;
       case this.$['third-party']:
-        if (this.voiceMatchEnforcedOff) {
+        if (this.voiceMatchEnforcedOff || this.voiceMatchDisabled) {
           this.showScreen(this.$['get-more']);
         } else {
           this.showScreen(this.$['voice-match']);

chrome/browser/resources/settings/google_assistant_page/google_assistant_page.js

@@ -196,6 +196,7 @@ Polymer({
     this.refreshDspHotwordState_();
 
     this.shouldShowVoiceMatchSettings_ =
+        !loadTimeData.getBoolean('voiceMatchDisabled') &&
         this.getPref('settings.voice_interaction.hotword.enabled.value') &&
         (this.getPref(
           'settings.voice_interaction.activity_control.consent_status.value') ==

chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_ui.cc

@@ -21,6 +21,7 @@
 #include "chrome/grit/browser_resources.h"
 #include "chromeos/assistant/buildflags.h"
 #include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
+#include "chromeos/services/assistant/public/features.h"
 #include "components/prefs/pref_service.h"
 #include "components/session_manager/core/session_manager.h"
 #include "content/public/browser/host_zoom_map.h"
@@ -81,7 +82,6 @@ AssistantOptInUI::AssistantOptInUI(content::WebUI* web_ui)
   source->UseStringsJs();
   source->AddResourcePath("assistant_optin.js", IDR_ASSISTANT_OPTIN_JS);
   source->AddResourcePath("assistant_logo.png", IDR_ASSISTANT_LOGO_PNG);
-  source->AddBoolean("hotwordDspAvailable", chromeos::IsHotwordDspAvailable());
   source->SetDefaultResource(IDR_ASSISTANT_OPTIN_HTML);
   source->AddResourcePath("voice_match_animation.json",
                           IDR_ASSISTANT_VOICE_MATCH_ANIMATION);

chrome/browser/ui/webui/chromeos/login/assistant_optin_flow_screen_handler.cc

@@ -144,6 +144,14 @@ void AssistantOptInFlowScreenHandler::RegisterMessages() {
               &AssistantOptInFlowScreenHandler::HandleFlowInitialized);
 }
 
+void AssistantOptInFlowScreenHandler::GetAdditionalParameters(
+    base::DictionaryValue* dict) {
+  dict->SetBoolean("hotwordDspAvailable", chromeos::IsHotwordDspAvailable());
+  dict->SetBoolean("voiceMatchDisabled",
+                   chromeos::assistant::features::IsVoiceMatchDisabled());
+  BaseScreenHandler::GetAdditionalParameters(dict);
+}
+
 void AssistantOptInFlowScreenHandler::Bind(AssistantOptInFlowScreen* screen) {
   BaseScreenHandler::SetBaseScreen(screen);
   screen_ = screen;

chrome/browser/ui/webui/chromeos/login/assistant_optin_flow_screen_handler.h

@@ -63,6 +63,7 @@ class AssistantOptInFlowScreenHandler
   void DeclareLocalizedValues(
       ::login::LocalizedValuesBuilder* builder) override;
   void RegisterMessages() override;
+  void GetAdditionalParameters(base::DictionaryValue* dict) override;
 
   // AssistantOptInFlowScreenView:
   void Bind(AssistantOptInFlowScreen* screen) override;

chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc

@@ -2710,6 +2710,9 @@ void AddGoogleAssistantStrings(content::WebUIDataSource* html_source,
 
   html_source->AddBoolean("hotwordDspAvailable",
                           chromeos::IsHotwordDspAvailable());
+  html_source->AddBoolean(
+      "voiceMatchDisabled",
+      chromeos::assistant::features::IsVoiceMatchDisabled());
 }
 #endif
 

chromeos/services/assistant/assistant_manager_service_impl.cc

@@ -1198,7 +1198,8 @@ void AssistantManagerServiceImpl::UpdateInternalOptions(
         assistant_client::InternalOptions::UserCredentialMode::SIGNED_OUT);
   }
 
-  internal_options->EnableRequireVoiceMatchVerification();
+  if (!features::IsVoiceMatchDisabled())
+    internal_options->EnableRequireVoiceMatchVerification();
 
   assistant_manager_internal->SetOptions(*internal_options, [](bool success) {
     DVLOG(2) << "set options: " << success;

chromeos/services/assistant/assistant_settings_manager_impl.cc

@@ -176,7 +176,8 @@ void AssistantSettingsManagerImpl::SyncSpeakerIdEnrollmentStatus() {
   DCHECK(main_task_runner()->RunsTasksInCurrentSequence());
 
   if (assistant_state()->allowed_state() !=
-      ash::mojom::AssistantAllowedState::ALLOWED) {
+          ash::mojom::AssistantAllowedState::ALLOWED ||
+      features::IsVoiceMatchDisabled()) {
     return;
   }
 

chromeos/services/assistant/public/features.cc

@@ -72,6 +72,10 @@ const base::Feature kEnableMediaSessionIntegration{
     "AssistantEnableMediaSessionIntegration",
     base::FEATURE_DISABLED_BY_DEFAULT};
 
+// Disable voice match for test purpose.
+const base::Feature kDisableVoiceMatch{"DisableVoiceMatch",
+                                       base::FEATURE_DISABLED_BY_DEFAULT};
+
 int GetProactiveSuggestionsMaxWidth() {
   return kAssistantProactiveSuggestionsMaxWidth.Get();
 }
@@ -144,6 +148,10 @@ bool IsWarmerWelcomeEnabled() {
   return base::FeatureList::IsEnabled(kAssistantWarmerWelcomeFeature);
 }
 
+bool IsVoiceMatchDisabled() {
+  return base::FeatureList::IsEnabled(kDisableVoiceMatch);
+}
+
 }  // namespace features
 }  // namespace assistant
 }  // namespace chromeos

chromeos/services/assistant/public/features.h

@@ -127,6 +127,9 @@ COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsStereoAudioInputEnabled();
 
 COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsWarmerWelcomeEnabled();
 
+COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC)
+bool IsVoiceMatchDisabled();
+
 }  // namespace features
 }  // namespace assistant
 }  // namespace chromeos