Enable voice match for opt-out mode

No longer need to hide voice match settings option.
No longer need to show opt-in flow instead of voice training flow.
Update browser tests.

browser_tests

Bug: b/132107317
Test: run OSSettingsGoogleAssistantPageTest.AllJsTests in
Change-Id: I518603672ef06f7b849532adf23581abfaeb56b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2322066Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Yue Li <updowndota@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792849}

ash/assistant/assistant_controller_impl.cc

@@ -93,17 +93,8 @@ void AssistantControllerImpl::SendAssistantFeedback(
 }
 
 void AssistantControllerImpl::StartSpeakerIdEnrollmentFlow() {
-  if (assistant_state_controller_.consent_status().value_or(
-          chromeos::assistant::prefs::ConsentStatus::kUnknown) ==
-      chromeos::assistant::prefs::ConsentStatus::kActivityControlAccepted) {
-    // If activity control has been accepted, launch the enrollment flow.
-    setup_controller()->StartOnboarding(false /* relaunch */,
-                                        FlowType::kSpeakerIdEnrollment);
-  } else {
-    // If activity control has not been accepted, launch the opt-in flow.
-    setup_controller()->StartOnboarding(false /* relaunch */,
-                                        FlowType::kConsentFlow);
-  }
+  setup_controller()->StartOnboarding(false /* relaunch */,
+                                      FlowType::kSpeakerIdEnrollment);
 }
 
 void AssistantControllerImpl::DownloadImage(

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

@@ -198,10 +198,7 @@ Polymer({
 
     this.shouldShowVoiceMatchSettings_ =
         !loadTimeData.getBoolean('voiceMatchDisabled') &&
-        !!this.getPref('settings.voice_interaction.hotword.enabled').value &&
-        (this.getPref(
-                 'settings.voice_interaction.activity_control.consent_status')
-             .value == ConsentStatus.kActivityControlAccepted);
+        !!this.getPref('settings.voice_interaction.hotword.enabled').value;
 
     const hotwordEnabled =
         this.getPref('settings.voice_interaction.hotword.enabled');

chrome/test/data/webui/settings/chromeos/google_assistant_page_test.js

@@ -226,35 +226,16 @@ suite('GoogleAssistantHandler', function() {
     button = page.$$('#retrain-voice-model');
     assertFalse(!!button);
 
-    // Hotword enabled.
-    // Activity control consent not granted.
-    // Button should not be shown.
-    page.setPrefValue('settings.voice_interaction.hotword.enabled', true);
-    page.setPrefValue(
-        'settings.voice_interaction.activity_control.consent_status',
-        ConsentStatus.kUnauthorized);
-    Polymer.dom.flush();
-    button = page.$$('#retrain-voice-model');
-    assertFalse(!!button);
-
     // Hotword disabled.
-    // Activity control consent granted.
     // Button should not be shown.
     page.setPrefValue('settings.voice_interaction.hotword.enabled', false);
-    page.setPrefValue(
-        'settings.voice_interaction.activity_control.consent_status',
-        ConsentStatus.kActivityControlAccepted);
     Polymer.dom.flush();
     button = page.$$('#retrain-voice-model');
     assertFalse(!!button);
 
     // Hotword enabled.
-    // Activity control consent granted.
     // Button should be shown.
     page.setPrefValue('settings.voice_interaction.hotword.enabled', true);
-    page.setPrefValue(
-        'settings.voice_interaction.activity_control.consent_status',
-        ConsentStatus.kActivityControlAccepted);
     Polymer.dom.flush();
     button = page.$$('#retrain-voice-model');
     assertTrue(!!button);