Use shark requisition instead of command line parameter

BUG=None

Review URL: https://codereview.chromium.org/524903003

Cr-Commit-Position: refs/heads/master@{#293056}

3 files changed, 6 insertions, 11 deletions

diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 7953d4a..3f0cb98 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,11 @@ void WizardController::OnConnectionFailed() {
 
 void WizardController::OnUpdateCompleted() {
   // TODO(dzhioev): place checks related to pairing in a proper place.
-  if (ShouldShowControllerPairingScreen()) {
+  const bool is_shark =
+      g_browser_process->platform_part()->browser_policy_connector_chromeos()->
+      GetDeviceCloudPolicyManager()->IsSharkRequisition();
+
+  if (is_shark) {
     ShowControllerPairingScreen();
   } else if (ShouldShowHostPairingScreen()) {
     ShowHostPairingScreen();
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index 53cd7e9..6907908 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -218,10 +218,6 @@ const char kShillStub[] = "shill-stub";
 
 // If this switch is set, controller pairing process is displayed after update
 // stage of OOBE.
-const char kShowControllerPairingDemo[] = "show-controller-pairing-demo";
-
-// If this switch is set, controller pairing process is displayed after update
-// stage of OOBE.
 const char kShowHostPairingDemo[] = "show-host-pairing-demo";
 
 // Sends test messages on first call to RequestUpdate (stub only).
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
index 745e0f4..f1be482 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -74,7 +74,6 @@ CHROMEOS_EXPORT extern const char kOobeSkipPostLogin[];
 CHROMEOS_EXPORT extern const char kOobeTimerInterval[];
 CHROMEOS_EXPORT extern const char kPowerStub[];
 CHROMEOS_EXPORT extern const char kShillStub[];
-CHROMEOS_EXPORT extern const char kShowControllerPairingDemo[];
 CHROMEOS_EXPORT extern const char kShowHostPairingDemo[];
 CHROMEOS_EXPORT extern const char kSmsTestMessages[];
 CHROMEOS_EXPORT extern const char kStubCrosSettings[];