Apply default policy values also on non-ChromeOS

components/policy/core/common/cloud/user_cloud_policy_manager.cc

Index: components/policy/core/common/cloud/user_cloud_policy_manager.cc
diff --git a/components/policy/core/common/cloud/user_cloud_policy_manager.cc b/components/policy/core/common/cloud/user_cloud_policy_manager.cc
index f758a0db83dae62c084552dde584625787e52bf1..50a151dd4a992eba3cf32a640639a3c86fe04869 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_manager.cc
+++ b/components/policy/core/common/cloud/user_cloud_policy_manager.cc
@@ -16,6 +16,7 @@
 #include "components/policy/core/common/cloud/user_cloud_policy_store.h"
 #include "components/policy/core/common/policy_pref_names.h"
 #include "components/policy/core/common/policy_types.h"
+#include "components/policy/policy_constants.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace em = enterprise_management;
@@ -96,4 +97,15 @@ bool UserCloudPolicyManager::IsClientRegistered() const {
   return client() && client()->is_registered();
 }
 
+void UserCloudPolicyManager::GetChromePolicy(PolicyMap* policy_map) {
+  CloudPolicyManager::GetChromePolicy(policy_map);
+
+  // If the store has a verified policy blob received from the server then apply
+  // the defaults for policies that haven't been configured by the administrator
+  // given that this is an enterprise user.
+  if (!store()->has_policy())
+    return;
+  SetEnterpriseUsersDefaults(policy_map);
+}
+
 }  // namespace policy