cros: Remove profile picture selection screen from OOBE (Part I)

This CL changes the behavior. Another CL (https://crrev.com/c/1341158)
removes the resources, but for now we don't want to land the second
one because the resources will be used by Discover.

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

chrome/browser/chromeos/login/oobe_interactive_ui_test.cc

@@ -311,17 +311,6 @@ class OobeInteractiveUITest
     LOG(INFO) << "OobeInteractiveUITest: Switched to 'user-image' screen.";
   }
 
-  void RunUserImageScreenChecks() {
-    js_checker_.ExpectTrue("!$('user-image').hidden");
-  }
-
-  void ExitUserImageScreen() {
-    js_checker_.Evaluate("$('user-image').querySelector('#ok-button').click()");
-
-    LOG(INFO) << "OobeInteractiveUITest: Exited 'user-image' screen.";
-    WaitForLoginDisplayHostShutdown();
-  }
-
   base::Optional<std::string> quick_unlock_private_get_auth_token_password_;
 
  private:
@@ -365,9 +354,6 @@ IN_PROC_BROWSER_TEST_F(OobeInteractiveUITest, DISABLED_SimpleEndToEnd) {
   RunMarketingOptInScreenChecks();
   ExitMarketingOptInScreen();
 
-  RunUserImageScreenChecks();
-  ExitUserImageScreen();
-
   WaitForLoginDisplayHostShutdown();
 }
 

chrome/browser/chromeos/login/wizard_controller.cc

@@ -996,19 +996,7 @@ void WizardController::OnUpdateErrorUpdating(bool is_critical_update) {
     OnUpdateCompleted();
 }
 
-void WizardController::EnableUserImageScreenReturnToPreviousHack() {
-  user_image_screen_return_to_previous_hack_ = true;
-}
-
 void WizardController::OnUserImageSelected() {
-  if (user_image_screen_return_to_previous_hack_) {
-    user_image_screen_return_to_previous_hack_ = false;
-    DCHECK(previous_screen_);
-    if (previous_screen_) {
-      SetCurrentScreen(previous_screen_);
-      return;
-    }
-  }
   OnOobeFlowFinished();
 }
 
@@ -1168,7 +1156,7 @@ void WizardController::OnAssistantOptInFlowFinished() {
 }
 
 void WizardController::OnMultiDeviceSetupFinished() {
-  ShowUserImageScreen();
+  OnOobeFlowFinished();
 }
 
 void WizardController::OnControllerPairingFinished() {

chrome/browser/chromeos/login/wizard_controller.h

@@ -452,10 +452,6 @@ class WizardController : public BaseScreenDelegate,
 
   bool is_in_session_oobe_ = false;
 
-  // Indicates that once image selection screen finishes we should return to
-  // a previous screen instead of proceeding with usual flow.
-  bool user_image_screen_return_to_previous_hack_ = false;
-
   // Non-owning pointer to local state used for testing.
   static PrefService* local_state_for_testing_;