Introduced switches for Master/Slave bootstrapping process.

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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 30 matching lines @@
 using content::BrowserThread;
 
 namespace em = enterprise_management;
 
 namespace policy {
 
 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
 // in the "serial_number" key for v2+ VPDs. However, legacy devices used a
 // different key to report their serial number, which we fall back to if
 // "serial_number" is not present.
 //
 // Product_S/N is still special-cased due to inconsistencies with serial
 // numbers on Lumpy devices: On these devices, serial_number is identical to
 // Product_S/N with an appended checksum. Unfortunately, the sticker on the
@@ skipping 112 matching lines @@
         local_state_->SetBoolean(prefs::kDeviceEnrollmentCanExit, false);
       }
     }
   }
 }
 
 bool DeviceCloudPolicyManagerChromeOS::IsRemoraRequisition() const {
   return GetDeviceRequisition() == kRemoraRequisition;
 }
 
-bool DeviceCloudPolicyManagerChromeOS::IsSharkRequisition() const {
-  return GetDeviceRequisition() == kSharkRequisition;
-}
-
 void DeviceCloudPolicyManagerChromeOS::Shutdown() {
   status_uploader_.reset();
   syslog_uploader_.reset();
   heartbeat_scheduler_.reset();
   state_keys_update_subscription_.reset();
   CloudPolicyManager::Shutdown();
 }
 
 // static
 void DeviceCloudPolicyManagerChromeOS::RegisterPrefs(
@@ skipping 101 matching lines @@
 
   const PrefService::Preference* pref = local_state_->FindPreference(
       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) {
+      if (requisition == kRemoraRequisition) {
         local_state_->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true);
         local_state_->SetBoolean(prefs::kDeviceEnrollmentCanExit, false);
       } else {
         local_state_->SetBoolean(
             prefs::kDeviceEnrollmentAutoStart,
             GetMachineFlag(chromeos::system::kOemIsEnterpriseManagedKey,
                            false));
         local_state_->SetBoolean(
             prefs::kDeviceEnrollmentCanExit,
             GetMachineFlag(chromeos::system::kOemCanExitEnterpriseEnrollmentKey,
@@ skipping 19 matching lines @@
       make_scoped_ptr(new DeviceStatusCollector(
           local_state_, chromeos::system::StatisticsProvider::GetInstance(),
           DeviceStatusCollector::LocationUpdateRequester(),
           DeviceStatusCollector::VolumeInfoFetcher(),
           DeviceStatusCollector::CPUStatisticsFetcher(),
           DeviceStatusCollector::CPUTempFetcher())),
       task_runner_));
 }
 
 }  // namespace policy