Chrome OS: swap pin setup and fingerprint screens in first run flow.

Bug: 898584
Change-Id: Idb912a1784eda258eee0593388a9af5d92046bc8
Reviewed-on: https://chromium-review.googlesource.com/c/1298201Reviewed-by: Wenzhao (Colin) Zang <wzang@chromium.org>
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#602538}

chrome/browser/chromeos/login/wizard_controller.cc

@@ -1069,7 +1069,12 @@ void WizardController::OnTermsOfServiceAccepted() {
 }
 
 void WizardController::OnSyncConsentFinished() {
-  ShowDiscoverScreen();
+  if (chromeos::quick_unlock::IsFingerprintEnabled(
+          ProfileManager::GetActiveUserProfile())) {
+    ShowFingerprintSetupScreen();
+  } else {
+    ShowDiscoverScreen();
+  }
 }
 
 void WizardController::OnDiscoverScreenFinished() {
@@ -1077,16 +1082,11 @@ void WizardController::OnDiscoverScreenFinished() {
 }
 
 void WizardController::OnMarketingOptInFinished() {
-  if (chromeos::quick_unlock::IsFingerprintEnabled(
-          ProfileManager::GetActiveUserProfile())) {
-    ShowFingerprintSetupScreen();
-  } else {
-    ShowArcTermsOfServiceScreen();
-  }
+  ShowArcTermsOfServiceScreen();
 }
 
 void WizardController::OnFingerprintSetupFinished() {
-  ShowArcTermsOfServiceScreen();
+  ShowDiscoverScreen();
 }
 
 void WizardController::OnArcTermsOfServiceSkipped() {