Update Assistant voice match training logics

No longer need to wait for Assistant restart when toggle Hotword.

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

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

@@ -240,15 +240,7 @@ void AssistantOptInFlowScreenHandler::OnEmailOptInResult(bool opted_in) {
 void AssistantOptInFlowScreenHandler::OnStateChanged(
     ash::mojom::VoiceInteractionState state) {
   if (state != ash::mojom::VoiceInteractionState::NOT_READY) {
-    if (voice_enrollment_pending) {
-      voice_enrollment_pending = false;
-      DCHECK(settings_manager_.is_bound() &&
-             base::FeatureList::IsEnabled(
-                 assistant::features::kAssistantVoiceMatch));
-      settings_manager_->StartSpeakerIdEnrollment(true, std::move(client_ptr_));
-    } else {
-      BindAssistantSettingsManager();
-    }
+    BindAssistantSettingsManager();
     arc::VoiceInteractionControllerClient::Get()->RemoveObserver(this);
   }
 }
@@ -449,14 +441,9 @@ void AssistantOptInFlowScreenHandler::HandleVoiceMatchScreenUserAction(
     ShowNextScreen();
   } else if (action == kRecordPressed) {
     if (!prefs->GetBoolean(arc::prefs::kVoiceInteractionHotwordEnabled)) {
-      // Turn on hotword will restart the Assistant service. Thus the enrollment
-      // request should be sent after the service restart complete.
-      voice_enrollment_pending = true;
       prefs->SetBoolean(arc::prefs::kVoiceInteractionHotwordEnabled, true);
-      arc::VoiceInteractionControllerClient::Get()->AddObserver(this);
-    } else {
-      settings_manager_->StartSpeakerIdEnrollment(true, std::move(client_ptr_));
     }
+    settings_manager_->StartSpeakerIdEnrollment(true, std::move(client_ptr_));
   }
 }
 

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

@@ -130,9 +130,6 @@ class AssistantOptInFlowScreenHandler
   // Whether the screen has been initialized.
   bool initialized_ = false;
 
-  // Whether there is a pending voice match enrollment request.
-  bool voice_enrollment_pending = false;
-
   mojo::Binding<assistant::mojom::SpeakerIdEnrollmentClient> client_binding_;
   assistant::mojom::SpeakerIdEnrollmentClientPtr client_ptr_;
   assistant::mojom::AssistantSettingsManagerPtr settings_manager_;