This moves the ONC parsing code into chromeos/network/onc

chrome/browser/policy/network_configuration_updater.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 "chrome/browser/policy/network_configuration_updater.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/policy/policy_map.h"
+#include "chromeos/network/onc/onc_constants.h"
 #include "policy/policy_constants.h"
 
 namespace policy {
 
 const char NetworkConfigurationUpdater::kEmptyConfiguration[] =
     "{\"NetworkConfigurations\":[],\"Certificates\":[]}";
 
 NetworkConfigurationUpdater::NetworkConfigurationUpdater(
     PolicyService* policy_service,
     chromeos::NetworkLibrary* network_library)
     : policy_change_registrar_(
           policy_service, POLICY_DOMAIN_CHROME, std::string()),
       network_library_(network_library),
       user_policy_initialized_(false),
       allow_web_trust_(false),
       policy_service_(policy_service) {
   DCHECK(network_library_);
   policy_change_registrar_.Observe(
       key::kDeviceOpenNetworkConfiguration,
       base::Bind(&NetworkConfigurationUpdater::OnPolicyChanged,
                  base::Unretained(this),
-                 chromeos::NetworkUIData::ONC_SOURCE_DEVICE_POLICY));
+                 chromeos::onc::ONC_SOURCE_DEVICE_POLICY));
   policy_change_registrar_.Observe(
       key::kOpenNetworkConfiguration,
       base::Bind(&NetworkConfigurationUpdater::OnPolicyChanged,
                  base::Unretained(this),
-                 chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY));
+                 chromeos::onc::ONC_SOURCE_USER_POLICY));
 
   network_library_->AddNetworkProfileObserver(this);
 
   // Apply the current policies immediately.
   ApplyNetworkConfigurations();
 }
 
 NetworkConfigurationUpdater::~NetworkConfigurationUpdater() {
   network_library_->RemoveNetworkProfileObserver(this);
 }
 
 void NetworkConfigurationUpdater::OnProfileListChanged() {
   VLOG(1) << "Network profile list changed, applying policies.";
   ApplyNetworkConfigurations();
 }
 
 void NetworkConfigurationUpdater::OnUserPolicyInitialized() {
   VLOG(1) << "User policy initialized, applying policies. Ignoring.";
   user_policy_initialized_ = true;
   ApplyNetworkConfigurations();
 }
 
 void NetworkConfigurationUpdater::OnPolicyChanged(
-    chromeos::NetworkUIData::ONCSource onc_source,
+    chromeos::onc::ONCSource onc_source,
     const base::Value* previous,
     const base::Value* current) {
   VLOG(1) << "Policy for ONC source " << onc_source << " changed.";
   ApplyNetworkConfigurations();
 }
 
 void NetworkConfigurationUpdater::ApplyNetworkConfigurations() {
   ApplyNetworkConfiguration(key::kDeviceOpenNetworkConfiguration,
-                            chromeos::NetworkUIData::ONC_SOURCE_DEVICE_POLICY);
+                            chromeos::onc::ONC_SOURCE_DEVICE_POLICY);
   if (user_policy_initialized_) {
     ApplyNetworkConfiguration(key::kOpenNetworkConfiguration,
-                              chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);
+                              chromeos::onc::ONC_SOURCE_USER_POLICY);
   }
 }
 
 void NetworkConfigurationUpdater::ApplyNetworkConfiguration(
     const std::string& policy_key,
-    chromeos::NetworkUIData::ONCSource onc_source) {
+    chromeos::onc::ONCSource onc_source) {
   VLOG(1) << "Apply policy for ONC source " << onc_source;
   const PolicyMap& policies = policy_service_->GetPolicies(POLICY_DOMAIN_CHROME,
                                                            std::string());
   const base::Value* policy_value = policies.GetValue(policy_key);
 
   std::string new_network_config;
   if (policy_value != NULL) {
     // If the policy is not a string, we issue a warning, but still clear the
     // network configuration.
     if (!policy_value->GetAsString(&new_network_config))
       LOG(WARNING) << "ONC policy is not a string value.";
   }
 
   // An empty string is not a valid ONC and generates warnings and
   // errors. Replace by a valid empty configuration.
   if (new_network_config.empty())
     new_network_config = kEmptyConfiguration;
 
   std::string unused_error;
   network_library_->LoadOncNetworks(new_network_config, "", onc_source,

[pneubeck (no reviews), 2012/12/04 10:43:56]

LoadOncNetworks doesn't LOG(ERROR).
Please do that here, as you did with in net_internals.cc.

Alternatively, change LOG(WARNING) to LOG(ERROR) in LoadOncNetworks.

[Greg Spencer (Chromium), 2012/12/07 18:12:27]

|error| went away.

                                     allow_web_trust_, &unused_error);
 }
 
 }  // namespace policy