Use shark requisition instead of command line parameter

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 34 matching lines @@
 #include "chrome/browser/chromeos/login/screens/update_screen.h"
 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/oobe_display.h"
 #include "chrome/browser/chromeos/net/delay_network_call.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
+#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/timezone/timezone_provider.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/metrics/metrics_reporting_state.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/audio/cras_audio_handler.h"
@@ skipping 33 matching lines @@
   chromeos::WizardController::kTermsOfServiceScreenName,
   chromeos::WizardController::kAutoEnrollmentCheckScreenName
 };
 
 // Checks flag for HID-detection screen show.
 bool CanShowHIDDetectionScreen() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(
         chromeos::switches::kDisableHIDDetectionOnOOBE);
 }
 
-bool ShouldShowControllerPairingScreen() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      chromeos::switches::kShowControllerPairingDemo);
-}
-
 bool ShouldShowHostPairingScreen() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kShowHostPairingDemo);
 }
 
 bool IsResumableScreen(const std::string& screen) {
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kResumableScreens); ++i) {
     if (screen == kResumableScreens[i])
       return true;
   }
@@ skipping 502 matching lines @@
   ShowLoginScreen(LoginScreenContext());
 }
 
 void WizardController::OnConnectionFailed() {
   // TODO(dpolukhin): show error message after login screen is displayed.
   ShowLoginScreen(LoginScreenContext());
 }
 
 void WizardController::OnUpdateCompleted() {
   // TODO(dzhioev): place checks related to pairing in a proper place.
-  if (ShouldShowControllerPairingScreen()) {
+  if (g_browser_process->platform_part()->browser_policy_connector_chromeos()->

[achuithb, 2014/08/29 23:53:11]

You'll probably hate me for saying this, but this line is long enough and hard
enough to read that const bool is_shark may be useful here.

The other option is to add a comment saying that we show the controller pairing
screen for shark devices.

Or maybe both?

[Zachary Kuznia, 2014/09/03 00:01:59]

Done.

+      GetDeviceCloudPolicyManager()->IsSharkRequisition()) {
     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();
   }
@@ skipping 648 matching lines @@
   if (ShouldAutoStartEnrollment() || ShouldRecoverEnrollment()) {
     StartupUtils::MarkEulaAccepted();
     auth_token_ = token;
     InitiateOOBEUpdate();
   } else {
     LOG(WARNING) << "Not in device enrollment.";
   }
 }
 
 }  // namespace chromeos