Apply global auto connect ONC policy in GetManagedProperties.

chromeos/network/policy_util.h

 // Copyright 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.
 
 #ifndef CHROMEOS_NETWORK_POLICY_UTIL_H_
 #define CHROMEOS_NETWORK_POLICY_UTIL_H_
 
 #include <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace chromeos {
 
 struct NetworkProfile;
 
 namespace policy_util {
 
 typedef std::map<std::string, const base::DictionaryValue*> GuidToPolicyMap;
 
+scoped_ptr<base::DictionaryValue> CreateManagedONC(

[stevenjb, 2014/08/28 16:19:41]

At some point we should document the "ManagedONC" Dictionary format and refer to
that here. For now maybe add a TODO?

[pneubeck (no reviews), 2014/08/29 16:22:21]

Created a bug.

+    const base::DictionaryValue* global_policy,
+    const base::DictionaryValue* network_policy,
+    const base::DictionaryValue* user_settings,
+    const base::DictionaryValue* active_settings,
+    const NetworkProfile* profile);
+
+  // Adds properties to |properties_to_update|, which are enforced on an
+  // unamaged network by the global network config of the policy.
+  // |entry_properties| are the network's current properties read from its
+  // profile entry.

[stevenjb, 2014/08/28 16:19:41]

Alignment

[pneubeck (no reviews), 2014/08/29 16:22:21]

Done.

+void SetShillPropertiesForGlobalPolicy(
+    const base::DictionaryValue& shill_dictionary,
+    const base::DictionaryValue* global_network_policy,
+    base::DictionaryValue* shill_properties_to_update);
+
 // Creates a Shill property dictionary from the given arguments. The resulting
 // dictionary will be sent to Shill by the caller. Depending on the profile
-// type, |policy| is interpreted as the user or device policy and |settings| as
-// the user or shared settings. |policy| or |settings| can be NULL, but not
-// both.
+// type, |network_policy| is interpreted as the user or device policy and
+// |user_settings| as the user or shared settings. |network_policy| or
+// |user_settings| can be NULL, but not both.
 scoped_ptr<base::DictionaryValue> CreateShillConfiguration(
     const NetworkProfile& profile,
     const std::string& guid,
-    const base::DictionaryValue* policy,
-    const base::DictionaryValue* settings);
+    const base::DictionaryValue* global_policy,
+    const base::DictionaryValue* network_policy,
+    const base::DictionaryValue* user_settings);
 
 // Returns the policy from |policies| matching |actual_network|, if any exists.
 // Returns NULL otherwise. |actual_network| must be part of a ONC
 // NetworkConfiguration.
 const base::DictionaryValue* FindMatchingPolicy(
     const GuidToPolicyMap& policies,
     const base::DictionaryValue& actual_network);
 
 }  // namespace policy_util
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_POLICY_UTIL_H_