Add ManagementMode enum and GetManagementMode().

chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc

 // Copyright 2014 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_initializer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/sequenced_task_runner.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_status_collector.h"
 #include "chrome/browser/chromeos/policy/enrollment_handler_chromeos.h"
 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
+#include "chrome/browser/chromeos/policy/policy_util.h"
 #include "chrome/browser/chromeos/policy/server_backed_device_state.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/system/statistics_provider.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/core/common/cloud/system_policy_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
@@ skipping 189 matching lines @@
       new CloudPolicyClient(DeviceCloudPolicyManagerChromeOS::GetMachineID(),
                             DeviceCloudPolicyManagerChromeOS::GetMachineModel(),
                             kPolicyVerificationKeyHash,
                             USER_AFFILIATION_NONE,
                             device_status_provider_.get(),
                             device_management_service,
                             request_context));
 }
 
 void DeviceCloudPolicyInitializer::TryToCreateClient() {
-  if (device_store_->is_initialized() &&
-      device_store_->has_policy() &&
-      !device_store_->policy()->request_token().empty() &&
-      !state_keys_broker_->pending() &&
-      !enrollment_handler_) {
-    DeviceManagementService* service = NULL;
-    if (device_store_->policy()->management_mode() ==
-        em::PolicyData::CONSUMER_MANAGED) {
-      service = consumer_service_;
-    } else {
-      service = enterprise_service_;
-    }
-    if (service)
-      StartConnection(CreateClient(service));
+  if (!device_store_->is_initialized() ||
+      !device_store_->has_policy() ||
+      state_keys_broker_->pending() ||
+      enrollment_handler_) {
+    return;
   }
+
+  DeviceManagementService* service = NULL;
+  if (PolicyUtil::IsConsumerManaged(*device_store_->policy()))
+    service = consumer_service_;
+  else if (PolicyUtil::IsEnterpriseManaged(*device_store_->policy()))
+    service = enterprise_service_;
+
+  if (service)
+    StartConnection(CreateClient(service));
 }
 
 void DeviceCloudPolicyInitializer::StartConnection(
     scoped_ptr<CloudPolicyClient> client) {
   if (!manager_->core()->service())
     manager_->StartConnection(client.Pass(), device_status_provider_.Pass());
 
   if (!on_connected_callback_.is_null()) {
     on_connected_callback_.Run();
     on_connected_callback_.Reset();
   }
 }
 
 }  // namespace policy