cros: Fix oobe flow for voice interaction

Correctly select voice interaction OOBE flow and runtime flow;
Update launcher button state after oobe flow;

BUG=b:65463229
BUG=b:65463264
TEST=local flash and test

Change-Id: Ibdef7ed5b9b45894fa74c76220d7971c621abb69
Reviewed-on: https://chromium-review.googlesource.com/656577
Commit-Queue: Muyuan Li <[email protected]>
Reviewed-by: Luis Hector Chavez <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Cr-Commit-Position: refs/heads/master@{#500716}

Author: Muyuan Li

chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.cc

@@ -489,7 +489,7 @@ void ArcVoiceInteractionFrameworkService::SetVoiceInteractionSetupCompleted() {
 
   PrefService* prefs = Profile::FromBrowserContext(context_)->GetPrefs();
   prefs->SetBoolean(prefs::kArcVoiceInteractionValuePropAccepted, true);
-  prefs->SetBoolean(prefs::kVoiceInteractionEnabled, true);
+  SetVoiceInteractionEnabled(true);
   prefs->SetBoolean(prefs::kVoiceInteractionContextEnabled, true);
 
   ash::Shell::Get()->NotifyVoiceInteractionSetupCompleted();
@@ -564,22 +564,25 @@ bool ArcVoiceInteractionFrameworkService::ValidateTimeSinceUserInteraction() {
   return true;
 }
 
+void ArcVoiceInteractionFrameworkService::StartVoiceInteractionOobe() {
+  if (chromeos::LoginDisplayHost::default_host())
+    return;
+  gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
+  // The display host will be destructed at the end of OOBE flow.
+  chromeos::LoginDisplayHostImpl* display_host =
+      new chromeos::LoginDisplayHostImpl(screen_bounds);
+  display_host->StartVoiceInteractionOobe();
+}
+
 bool ArcVoiceInteractionFrameworkService::InitiateUserInteraction() {
   VLOG(1) << "Start voice interaction.";
   PrefService* prefs = Profile::FromBrowserContext(context_)->GetPrefs();
   if (!prefs->GetBoolean(prefs::kArcVoiceInteractionValuePropAccepted)) {
     VLOG(1) << "Voice interaction feature not accepted.";
-    // If voice interaction value prop already showing, return.
-    if (chromeos::LoginDisplayHost::default_host())
-      return false;
+    should_start_runtime_flow_ = true;
     // If voice interaction value prop has not been accepted, show the value
     // prop OOBE page again.
-    gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
-    // The display host will be destructed at the end of OOBE flow.
-    chromeos::LoginDisplayHostImpl* display_host =
-        new chromeos::LoginDisplayHostImpl(screen_bounds);
-    should_start_runtime_flow_ = true;
-    display_host->StartVoiceInteractionOobe();
+    StartVoiceInteractionOobe();
     return false;
   }
 

chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.h

@@ -115,6 +115,9 @@ class ArcVoiceInteractionFrameworkService
   // Set voice interaction setup completed flag and notify the change.
   void SetVoiceInteractionSetupCompleted();
 
+  // Starts voice interaction OOBE flow.
+  void StartVoiceInteractionOobe();
+
   // For supporting ArcServiceManager::GetService<T>().
   static const char kArcServiceName[];
 

chrome/browser/chromeos/first_run/first_run.cc

@@ -140,7 +140,7 @@ class DialogLauncher : public content::NotificationObserver {
           arc::ArcVoiceInteractionFrameworkService::GetForBrowserContext(
               profile_);
       if (service)
-        service->StartSessionFromUserInteraction(gfx::Rect());
+        service->StartVoiceInteractionOobe();
     } else {
       TryLaunchFirstRunDialog(profile_);
     }