Added flag for enterprise zero-touch enrollment and force enrollment if

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.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/policy/device_cloud_policy_manager_chromeos.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 118 matching lines @@
 void DeviceCloudPolicyManagerChromeOS::Initialize(PrefService* local_state) {
   CHECK(local_state);
 
   local_state_ = local_state;
 
   state_keys_update_subscription_ = state_keys_broker_->RegisterUpdateCallback(
       base::Bind(&DeviceCloudPolicyManagerChromeOS::OnStateKeysUpdated,
                  base::Unretained(this)));
 
   InitializeRequisition();
+  InitializeEnrollment();
 }
 
 void DeviceCloudPolicyManagerChromeOS::AddDeviceCloudPolicyManagerObserver(
     Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void DeviceCloudPolicyManagerChromeOS::RemoveDeviceCloudPolicyManagerObserver(
     Observer* observer) {
   observers_.RemoveObserver(observer);
@@ skipping 19 matching lines @@
     if (requisition.empty()) {
       local_state_->ClearPref(prefs::kDeviceEnrollmentRequisition);
       local_state_->ClearPref(prefs::kDeviceEnrollmentAutoStart);
       local_state_->ClearPref(prefs::kDeviceEnrollmentCanExit);
     } else {
       local_state_->SetString(prefs::kDeviceEnrollmentRequisition, requisition);
       if (requisition == kNoRequisition) {
         local_state_->ClearPref(prefs::kDeviceEnrollmentAutoStart);
         local_state_->ClearPref(prefs::kDeviceEnrollmentCanExit);
       } else {
-        local_state_->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true);
-        local_state_->SetBoolean(prefs::kDeviceEnrollmentCanExit, false);
+        SetDeviceEnrollmentAutoStart();
       }
     }
   }
 }
 
 bool DeviceCloudPolicyManagerChromeOS::IsRemoraRequisition() const {
   return GetDeviceRequisition() == kRemoraRequisition;
 }
 
 bool DeviceCloudPolicyManagerChromeOS::IsSharkRequisition() const {
@@ skipping 123 matching lines @@
       prefs::kDeviceEnrollmentRequisition);
   if (pref->IsDefaultValue()) {
     std::string requisition =
         GetMachineStatistic(chromeos::system::kOemDeviceRequisitionKey);
 
     if (!requisition.empty()) {
       local_state_->SetString(prefs::kDeviceEnrollmentRequisition,
                               requisition);
       if (requisition == kRemoraRequisition ||
           requisition == kSharkRequisition) {
-        local_state_->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true);
-        local_state_->SetBoolean(prefs::kDeviceEnrollmentCanExit, false);
+        SetDeviceEnrollmentAutoStart();
       } else {
         local_state_->SetBoolean(
             prefs::kDeviceEnrollmentAutoStart,
             GetMachineFlag(chromeos::system::kOemIsEnterpriseManagedKey,
                            false));
         local_state_->SetBoolean(
             prefs::kDeviceEnrollmentCanExit,
             GetMachineFlag(chromeos::system::kOemCanExitEnterpriseEnrollmentKey,
                            false));
       }
     }
   }
 }
 
+const char kZeroTouchEnrollmentForced[] = "forced";

[pastarmovj, 2016/06/29 08:46:01]

nit: Can you move this to the top of the file please.

[The one and only Dr. Crash, 2016/06/29 21:04:38]

Done.

+
+void DeviceCloudPolicyManagerChromeOS::InitializeEnrollment() {
+  // Enrollment happens during OOBE only.
+  if (chromeos::StartupUtils::IsOobeCompleted())
+    return;
+
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(
+          chromeos::switches::kEnterpriseEnableZeroTouchEnrollment) &&
+      command_line->GetSwitchValueASCII(
+          chromeos::switches::kEnterpriseEnableZeroTouchEnrollment) ==
+          kZeroTouchEnrollmentForced) {
+    SetDeviceEnrollmentAutoStart();
+  }
+}
+
 void DeviceCloudPolicyManagerChromeOS::NotifyConnected() {
   FOR_EACH_OBSERVER(
       Observer, observers_, OnDeviceCloudPolicyManagerConnected());
 }
 
 void DeviceCloudPolicyManagerChromeOS::NotifyDisconnected() {
   FOR_EACH_OBSERVER(
       Observer, observers_, OnDeviceCloudPolicyManagerDisconnected());
 }
 
 void DeviceCloudPolicyManagerChromeOS::CreateStatusUploader() {
   status_uploader_.reset(new StatusUploader(
       client(),
       base::WrapUnique(new DeviceStatusCollector(
           local_state_, chromeos::system::StatisticsProvider::GetInstance(),
           DeviceStatusCollector::LocationUpdateRequester(),
           DeviceStatusCollector::VolumeInfoFetcher(),
           DeviceStatusCollector::CPUStatisticsFetcher(),
           DeviceStatusCollector::CPUTempFetcher())),
       task_runner_));
 }
 
 }  // namespace policy