Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / policy / device_cloud_policy_initializer.cc

diff --git a/src/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc b/src/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
index 7156b10..a63cf76 100644 (file)
--- a/src/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
+++ b/src/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
@@ -135,9 +135,9 @@ void DeviceCloudPolicyInitializer::StartEnrollment(
 }
 
 bool DeviceCloudPolicyInitializer::ShouldAutoStartEnrollment() const {
-  std::string restore_mode = GetRestoreMode();
-  if (restore_mode == kDeviceStateRestoreModeReEnrollmentRequested ||
-      restore_mode == kDeviceStateRestoreModeReEnrollmentEnforced) {
+  const RestoreMode restore_mode = GetRestoreMode();
+  if (restore_mode == RESTORE_MODE_REENROLLMENT_REQUESTED ||
+      restore_mode == RESTORE_MODE_REENROLLMENT_ENFORCED) {
     return true;
   }
 
@@ -163,7 +163,7 @@ std::string DeviceCloudPolicyInitializer::GetEnrollmentRecoveryDomain() const {
 }
 
 bool DeviceCloudPolicyInitializer::CanExitEnrollment() const {
-  if (GetRestoreMode() == kDeviceStateRestoreModeReEnrollmentEnforced)
+  if (GetRestoreMode() == RESTORE_MODE_REENROLLMENT_ENFORCED)
     return false;
 
   if (local_state_->HasPrefPath(prefs::kDeviceEnrollmentCanExit))
@@ -231,14 +231,15 @@ void DeviceCloudPolicyInitializer::TryToCreateClient() {
       !device_store_->policy()->request_token().empty() &&
       !state_keys_broker_->pending() &&
       !enrollment_handler_) {
-    DeviceManagementService* service;
+    DeviceManagementService* service = NULL;
     if (device_store_->policy()->management_mode() ==
         em::PolicyData::CONSUMER_MANAGED) {
       service = consumer_service_;
     } else {
       service = enterprise_service_;
     }
-    StartConnection(CreateClient(service));
+    if (service)
+      StartConnection(CreateClient(service));
   }
 }
 
@@ -253,12 +254,4 @@ void DeviceCloudPolicyInitializer::StartConnection(
   }
 }
 
-std::string DeviceCloudPolicyInitializer::GetRestoreMode() const {
-  const base::DictionaryValue* device_state_dict =
-      local_state_->GetDictionary(prefs::kServerBackedDeviceState);
-  std::string restore_mode;
-  device_state_dict->GetString(kDeviceStateRestoreMode, &restore_mode);
-  return restore_mode;
-}
-
 }  // namespace policy