Make host pairing screen the first screen for shark requisition.

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 90 matching lines @@
   chromeos::WizardController::kTermsOfServiceScreenName,
   chromeos::WizardController::kAutoEnrollmentCheckScreenName
 };
 
 // Checks flag for HID-detection screen show.
 bool CanShowHIDDetectionScreen() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(
         chromeos::switches::kDisableHIDDetectionOnOOBE);
 }
 
+// Checks if we are a remora waiting for a shark.
 bool ShouldShowHostPairingScreen() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
+  const bool is_remora =
+      g_browser_process->platform_part()->browser_policy_connector_chromeos()->
+      GetDeviceCloudPolicyManager()->IsRemoraRequisition();
+  const bool pairing_demo = CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kShowHostPairingDemo);
+  return is_remora && pairing_demo;
 }
 
 bool IsResumableScreen(const std::string& screen) {
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kResumableScreens); ++i) {
     if (screen == kResumableScreens[i])
       return true;
   }
   return false;
 }
 
@@ skipping 130 matching lines @@
     if (status == PrefService::INITIALIZATION_STATUS_ERROR) {
       OnLocalStateInitialized(false);
       return;
     } else if (status == PrefService::INITIALIZATION_STATUS_WAITING) {
       GetLocalState()->AddPrefInitObserver(
           base::Bind(&WizardController::OnLocalStateInitialized,
                      weak_factory_.GetWeakPtr()));
     }
   }
 
+  // Use the saved screen preference from Local State.
   const std::string screen_pref =
       GetLocalState()->GetString(prefs::kOobeScreenPending);
-  if (is_out_of_box_ && !screen_pref.empty() && (first_screen_name.empty() ||
+  if (is_out_of_box_ && !screen_pref.empty() &&
+      !ShouldShowHostPairingScreen() && (first_screen_name.empty() ||
       first_screen_name == WizardController::kTestNoScreenName)) {
     first_screen_name_ = screen_pref;
   }
 
   AdvanceToScreen(first_screen_name_);
   if (!IsMachineHWIDCorrect() && !StartupUtils::IsDeviceRegistered() &&
       first_screen_name_.empty())
     ShowWrongHWIDScreen();
 }
 
@@ skipping 288 matching lines @@
 }
 
 void WizardController::OnUpdateCompleted() {
   // TODO(dzhioev): place checks related to pairing in a proper place.
   const bool is_shark =
       g_browser_process->platform_part()->browser_policy_connector_chromeos()->
       GetDeviceCloudPolicyManager()->IsSharkRequisition();
 
   if (is_shark) {
     ShowControllerPairingScreen();
-  } else if (ShouldShowHostPairingScreen()) {
-    ShowHostPairingScreen();
   } else if (!auth_token_.empty()) {
     // TODO(achuith): There is an issue with the auto enrollment check and
     // remote enrollment. crbug.com/403147.
     ShowEnrollmentScreen();
   } else {
     ShowAutoEnrollmentCheckScreen();
   }
 }
 
 void WizardController::OnEulaAccepted() {
@@ skipping 304 matching lines @@
     AutoLaunchKioskApp();
   } else if (screen_name == kHIDDetectionScreenName) {
     ShowHIDDetectionScreen();
   } else if (screen_name == kControllerPairingScreenName) {
     ShowControllerPairingScreen();
   } else if (screen_name == kHostPairingScreenName) {
     ShowHostPairingScreen();
   } else if (screen_name != kTestNoScreenName) {
     if (is_out_of_box_) {
       time_oobe_started_ = base::Time::Now();
-      if (CanShowHIDDetectionScreen()) {
+      if (ShouldShowHostPairingScreen()) {
+        ShowHostPairingScreen();
+      } else if (CanShowHIDDetectionScreen()) {
         base::Callback<void(bool)> on_check = base::Bind(
             &WizardController::OnHIDScreenNecessityCheck,
             weak_factory_.GetWeakPtr());
         oobe_display_->GetHIDDetectionScreenActor()->CheckIsScreenRequired(
             on_check);
       } else {
         ShowNetworkScreen();
       }
     } else {
       ShowLoginScreen(LoginScreenContext());
@@ skipping 310 matching lines @@
 bool WizardController::SetOnTimeZoneResolvedForTesting(
     const base::Closure& callback) {
   if (timezone_resolved_)
     return false;
 
   on_timezone_resolved_for_testing_ = callback;
   return true;
 }
 
 }  // namespace chromeos