Add ONC 'Source' configuration property

chromeos/network/policy_applicator.cc

 // 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.
 
 #include "chromeos/network/policy_applicator.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 92 matching lines @@
     const base::DictionaryValue& entry_properties) {
   if (!handler_) {
     LOG(WARNING) << "Handler destructed during policy application to profile "
                  << profile_.ToDebugString();
     return;
   }
 
   VLOG(2) << "Received properties for entry " << entry << " of profile "
           << profile_.ToDebugString();
 
+  scoped_ptr<NetworkUIData> ui_data =
+      shill_property_util::GetUIDataFromProperties(entry_properties);
+
+  ::onc::ONCSource onc_source =
+      ui_data ? ui_data->onc_source() : ::onc::ONC_SOURCE_UNKNOWN;
   scoped_ptr<base::DictionaryValue> onc_part(
-      onc::TranslateShillServiceToONCPart(entry_properties,
-                                          &onc::kNetworkWithStateSignature));
+      onc::TranslateShillServiceToONCPart(
+          entry_properties, onc_source, &onc::kNetworkWithStateSignature));

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

you could always pass ONC_SOURCE_UNKNOWN as 'Source' of the result is not used.

[stevenjb, 2014/09/10 22:42:01]

Done.

 
   std::string old_guid;
   if (!onc_part->GetStringWithoutPathExpansion(::onc::network_config::kGUID,
                                                &old_guid)) {
     VLOG(1) << "Entry " << entry << " of profile " << profile_.ToDebugString()
             << " doesn't contain a GUID.";
     // This might be an entry of an older ChromeOS version. Assume it to be
     // unmanaged.
   }
 
-  scoped_ptr<NetworkUIData> ui_data =
-      shill_property_util::GetUIDataFromProperties(entry_properties);
   if (!ui_data) {
     VLOG(1) << "Entry " << entry << " of profile " << profile_.ToDebugString()
             << " contains no or no valid UIData.";
     // This might be an entry of an older ChromeOS version. Assume it to be
     // unmanaged. It's an inconsistency if there is a GUID but no UIData, thus
     // clear the GUID just in case.
     old_guid.clear();
   }
 
   bool was_managed = !old_guid.empty() && ui_data &&
@@ skipping 177 matching lines @@
                                               *it,
                                               &global_network_config_,
                                               network_policy,
                                               NULL /* no user settings */);
     WriteNewShillConfiguration(
         *shill_dictionary, *network_policy, false /* write now */);
   }
 }
 
 }  // namespace chromeos