Apply default policy values also on non-ChromeOS

components/policy/core/common/cloud/cloud_policy_manager.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 "components/policy/core/common/cloud/cloud_policy_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "components/policy/core/common/cloud/cloud_policy_service.h"
 #include "components/policy/core/common/policy_bundle.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_switches.h"
+#include "components/policy/policy_constants.h"
 #include "components/prefs/pref_service.h"
 #include "net/url_request/url_request_context_getter.h"
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "components/policy/core/common/cloud/resource_cache.h"
 #endif
 
 namespace policy {
 
 CloudPolicyManager::CloudPolicyManager(
@@ skipping 71 matching lines @@
     GetChromePolicy(
         &bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())));
     if (component_policy_service_)
       bundle->MergeFrom(component_policy_service_->policy());
     UpdatePolicy(std::move(bundle));
   }
 }
 
 void CloudPolicyManager::GetChromePolicy(PolicyMap* policy_map) {
   policy_map->CopyFrom(store()->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())
+    SetEnterpriseUsersDefaults(policy_map);

[Marc Treib, 2016/08/25 15:52:07]

This doesn't quite match the "spec" in the bug: I've moved it to
CloudPolicyManager rather than UserCloudPolicyManager, because the latter is
used only on non-ChromeOS platforms as far as I can tell.

[Andrew T Wilson (Slow), 2016/08/26 07:56:50]

I'm a bit concerned about this because it will now populate those policies in
device policy, when we really only want them populated in user policy.

I think it really does belong in UserCloudPolicyManager, and it's gross that
UserCloudPolicyManagerChromeOS doesn't derive from UserCloudPolicyManager, but
that just means you'll need to put it in two places (both UCPM and
UCPMChromeOS). On the bright side, it makes this patch smaller :D

[Marc Treib, 2016/08/26 09:19:19]

Yup, this code duplication is what I was trying to avoid... oh well. It's now in
both UserCloudPolicyManager[ChromeOS].

 }
 
 void CloudPolicyManager::CreateComponentCloudPolicyService(
     const base::FilePath& policy_cache_path,
     const scoped_refptr<net::URLRequestContextGetter>& request_context,
     CloudPolicyClient* client) {
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   // Init() must have been called.
   CHECK(schema_registry());
   // Called at most once.
@@ skipping 27 matching lines @@
   }
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 }
 
 void CloudPolicyManager::OnRefreshComplete(bool success) {
   waiting_for_policy_refresh_ = false;
   CheckAndPublishPolicy();
 }
 
 }  // namespace policy