Simplify usage of HonorDeviceDisablingDuringNormalOperation.

Bug: 784495
Change-Id: I16557453bd167e49b2deaeb99f1c1eb2bb80d1c7
Reviewed-on: https://chromium-review.googlesource.com/809630Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Commit-Queue: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522132}

chrome/browser/chromeos/login/existing_user_controller.cc

@@ -1575,10 +1575,7 @@ void ExistingUserController::ContinueLoginIfDeviceNotDisabled(
     return;
   }
 
-  bool device_disabled = false;
-  cros_settings_->GetBoolean(kDeviceDisabled, &device_disabled);
-  if (device_disabled && system::DeviceDisablingManager::
-                             HonorDeviceDisablingDuringNormalOperation()) {
+  if (system::DeviceDisablingManager::IsDeviceDisabledDuringNormalOperation()) {
     // If the device is disabled, bail out. A device disabled screen will be
     // shown by the DeviceDisablingManager.
 
@@ -1587,7 +1584,6 @@ void ExistingUserController::ContinueLoginIfDeviceNotDisabled(
     login_display_->SetUIEnabled(true);
     return;
   }
-  //  if ()
 
   chromeos::DBusThreadManager::Get()
       ->GetCryptohomeClient()

chrome/browser/chromeos/login/ui/login_display_host_webui.cc

@@ -856,10 +856,7 @@ void LoginDisplayHostWebUI::StartAppLaunch(const std::string& app_id,
     return;
   }
 
-  bool device_disabled = false;
-  CrosSettings::Get()->GetBoolean(kDeviceDisabled, &device_disabled);
-  if (device_disabled && system::DeviceDisablingManager::
-                             HonorDeviceDisablingDuringNormalOperation()) {
+  if (system::DeviceDisablingManager::IsDeviceDisabledDuringNormalOperation()) {
     // If the device is disabled, bail out. A device disabled screen will be
     // shown by the DeviceDisablingManager.
     return;

chrome/browser/chromeos/login/wizard_controller.cc

@@ -1441,10 +1441,7 @@ void WizardController::AutoLaunchKioskApp() {
     return;
   }
 
-  bool device_disabled = false;
-  CrosSettings::Get()->GetBoolean(kDeviceDisabled, &device_disabled);
-  if (device_disabled && system::DeviceDisablingManager::
-                             HonorDeviceDisablingDuringNormalOperation()) {
+  if (system::DeviceDisablingManager::IsDeviceDisabledDuringNormalOperation()) {
     // If the device is disabled, bail out. A device disabled screen will be
     // shown by the DeviceDisablingManager.
     return;

chrome/browser/chromeos/system/device_disabling_manager.cc

@@ -144,6 +144,17 @@ void DeviceDisablingManager::CheckWhetherDeviceDisabledDuringOOBE(
   callback.Run(true);
 }
 
+// static
+bool DeviceDisablingManager::IsDeviceDisabledDuringNormalOperation() {
+  bool device_disabled = false;
+  CrosSettings::Get()->GetBoolean(kDeviceDisabled, &device_disabled);
+  if (device_disabled && HonorDeviceDisablingDuringNormalOperation()) {
+    return true;
+  }
+
+  return false;
+}
+
 // static
 bool DeviceDisablingManager::HonorDeviceDisablingDuringNormalOperation() {
   // Device disabling should be honored when the device is enterprise managed

chrome/browser/chromeos/system/device_disabling_manager.h

@@ -104,6 +104,10 @@ class DeviceDisablingManager {
   void CheckWhetherDeviceDisabledDuringOOBE(
       const DeviceDisabledCheckCallback& callback);
 
+  // Returns true if trusted cros settings say the device is disabled and the
+  // device disabled setting should be honored.
+  static bool IsDeviceDisabledDuringNormalOperation();
+
   // Whenever trusted cros settings indicate that the device is disabled, this
   // method should be used to check whether the device disabling is to be
   // honored. If this method returns false, the device should not be disabled.