Fixed regression in about:policy from revision 235005.

chrome/browser/policy/profile_policy_connector.cc

 // Copyright (c) 2013 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/policy/profile_policy_connector.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/cloud_policy_manager.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/policy/forwarding_policy_provider.h"
 #include "chrome/browser/policy/policy_service_impl.h"
 #include "chrome/browser/policy/policy_transformations.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
 #include "chrome/browser/chromeos/policy/login_profile_policy_provider.h"
 #endif
 
 namespace policy {
 
 ProfilePolicyConnector::ProfilePolicyConnector()
 #if defined(OS_CHROMEOS)
     : is_primary_user_(false)
 #endif
@@ skipping 21 matching lines @@
   BrowserPolicyConnector* connector =
       g_browser_process->browser_policy_connector();
 
   if (connector->GetPlatformProvider()) {
     forwarding_policy_provider_.reset(
         new ForwardingPolicyProvider(connector->GetPlatformProvider()));
     forwarding_policy_provider_->Init(schema_registry);
     providers.push_back(forwarding_policy_provider_.get());
   }
 
+#if defined(OS_CHROMEOS)
+  if (connector->GetDeviceCloudPolicyManager())
+    providers.push_back(connector->GetDeviceCloudPolicyManager());
+#endif
+
   if (user_cloud_policy_manager)
     providers.push_back(user_cloud_policy_manager);
 
 #if defined(OS_CHROMEOS)
   if (!user) {
     DCHECK(schema_registry);
     // This case occurs for the signin profile.
     special_user_policy_provider_.reset(
         new LoginProfilePolicyProvider(connector->GetPolicyService()));
     special_user_policy_provider_->Init(schema_registry);
@@ skipping 47 matching lines @@
       connector->GetDeviceLocalAccountPolicyService();
   if (!device_local_account_policy_service)
     return;
   special_user_policy_provider_.reset(new DeviceLocalAccountPolicyProvider(
       username, device_local_account_policy_service));
   special_user_policy_provider_->Init(schema_registry);
 }
 #endif
 
 }  // namespace policy