Adding error handling to ONC validation.

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/chromeos/network_settings/onc_utils.h"
 #include "chrome/browser/policy/policy_map.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_);
@@ skipping 58 matching lines @@
   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;
+    new_network_config = chromeos::onc::kEmptyUnencryptedConfiguration;
 
   std::string unused_error;
   network_library_->LoadOncNetworks(new_network_config, "", onc_source,
                                     allow_web_trust_, &unused_error);
 }
 
 }  // namespace policy