Use shark requisition instead of command line parameter

chrome/browser/chromeos/login/wizard_controller.cc

Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 7953d4aa4ccd011ec5a8b76efb6e4ea3d780b5e1..e345b2d43f4c77acf95a0a38b009c48257f4836f 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -52,6 +52,7 @@
 #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"
@@ -105,11 +106,6 @@ bool CanShowHIDDetectionScreen() {
         chromeos::switches::kDisableHIDDetectionOnOOBE);
 }
 
-bool ShouldShowControllerPairingScreen() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      chromeos::switches::kShowControllerPairingDemo);
-}
-
 bool ShouldShowHostPairingScreen() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kShowHostPairingDemo);
@@ -632,7 +628,8 @@ void WizardController::OnConnectionFailed() {
 
 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();