Add ONC 'Source' configuration property

chromeos/network/onc/onc_translator.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_ONC_ONC_TRANSLATOR_H_
 #define CHROMEOS_NETWORK_ONC_ONC_TRANSLATOR_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
+#include "components/onc/onc_constants.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace chromeos {
 namespace onc {
 
 struct OncValueSignature;
 
 // Translates a hierarchical ONC dictionary |onc_object| to a flat Shill
 // dictionary. The |signature| declares the type of |onc_object| and must point
 // to one of the signature objects in "onc_signature.h". The resulting Shill
 // dictionary is returned.
 //
 // This function is used to translate network settings from ONC to Shill's
 // format before sending them to Shill.
 CHROMEOS_EXPORT
 scoped_ptr<base::DictionaryValue> TranslateONCObjectToShill(
     const OncValueSignature* signature,
     const base::DictionaryValue& onc_object);
 
 // Translates a |shill_dictionary| to an ONC object according to the given
 // |onc_signature|. |onc_signature| must point to a signature object in
 // "onc_signature.h". The resulting ONC object is returned.
 //
 // This function is used to translate network settings coming from Shill to ONC
 // before sending them to the UI. The result doesn't have to be valid ONC, but
 // only a subset of it and includes only the values that are actually required
-// by the UI.
+// by the UI. If |onc_source| specifies a Device or User policy then the

[pneubeck (no reviews), 2014/09/10 10:49:38]

As mentioned in the other comment, this leads to the misuse of providing
'ONC_SOURCE_NONE' as default value if the caller doesn't know the source, which
is not correct.

1) We could keep it as is, then we have to ensure that the argument is always
correctly provided.

2) Make two separate functions, one with and the other without the onc_source
argument, which will not output a 'Source' property.

3) We could update the ONCSource enum to (which could also be renamed to
NetworkPolicySource):
  { UNKNOWN, NONE, USER_POLICY, DEVICE_POLICY }
  (note that the USER_IMPORT is missing, which is anyways deprecated IMO)

   If the argument onc_source equals UNKNOWN, then no 'Source' property is
output.

[stevenjb, 2014/09/10 17:32:15]

Heh, I already jumped to '3' :)

+// 'Source' property of the ONC dictionary will be set accordingly.
 CHROMEOS_EXPORT
 scoped_ptr<base::DictionaryValue> TranslateShillServiceToONCPart(
     const base::DictionaryValue& shill_dictionary,
+    ::onc::ONCSource onc_source,
     const OncValueSignature* onc_signature);
 
 }  // namespace onc
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_ONC_ONC_TRANSLATOR_H_