| Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
|
| index 8f24001488e08da2914a9fb14222bcfc0bf5c2ee..c6e77cbcbdaa4eaef943f5fdea901d17bd2d64c7 100644
|
| --- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
|
| +++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
|
| @@ -48,7 +48,6 @@ namespace {
|
|
|
| const char kNoRequisition[] = "none";
|
| const char kRemoraRequisition[] = "remora";
|
| -const char kSharkRequisition[] = "shark";
|
|
|
| // These are the machine serial number keys that we check in order until we
|
| // find a non-empty serial number. The VPD spec says the serial number should be
|
| @@ -181,10 +180,6 @@ bool DeviceCloudPolicyManagerChromeOS::IsRemoraRequisition() const {
|
| return GetDeviceRequisition() == kRemoraRequisition;
|
| }
|
|
|
| -bool DeviceCloudPolicyManagerChromeOS::IsSharkRequisition() const {
|
| - return GetDeviceRequisition() == kSharkRequisition;
|
| -}
|
| -
|
| void DeviceCloudPolicyManagerChromeOS::Shutdown() {
|
| status_uploader_.reset();
|
| syslog_uploader_.reset();
|
| @@ -306,8 +301,7 @@ void DeviceCloudPolicyManagerChromeOS::InitializeRequisition() {
|
| if (!requisition.empty()) {
|
| local_state_->SetString(prefs::kDeviceEnrollmentRequisition,
|
| requisition);
|
| - if (requisition == kRemoraRequisition ||
|
| - requisition == kSharkRequisition) {
|
| + if (requisition == kRemoraRequisition) {
|
| local_state_->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true);
|
| local_state_->SetBoolean(prefs::kDeviceEnrollmentCanExit, false);
|
| } else {
|
|
|