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

chrome/browser/policy/configuration_policy_handler_chromeos.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/configuration_policy_handler_chromeos.h"
 
 #include <string>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_value_map.h"
 #include "base/string_util.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/cros/onc_constants.h"
-#include "chrome/browser/chromeos/network_settings/onc_signature.h"
-#include "chrome/browser/chromeos/network_settings/onc_utils.h"
-#include "chrome/browser/chromeos/network_settings/onc_validator.h"
 #include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/network/onc/onc_constants.h"
+#include "chromeos/network/onc/onc_signature.h"
+#include "chromeos/network/onc/onc_utils.h"
+#include "chromeos/network/onc/onc_validator.h"
 #include "grit/generated_resources.h"
 #include "policy/policy_constants.h"
 
 namespace onc = chromeos::onc;
 
 namespace {
 
 }  // namespace
 
 namespace policy {
 
 NetworkConfigurationPolicyHandler::NetworkConfigurationPolicyHandler(
     const char* policy_name,
-    chromeos::NetworkUIData::ONCSource onc_source)
+    chromeos::onc::ONCSource onc_source)
     : TypeCheckingPolicyHandler(policy_name, base::Value::TYPE_STRING),
       onc_source_(onc_source) {}
 
 NetworkConfigurationPolicyHandler::~NetworkConfigurationPolicyHandler() {}
 
 bool NetworkConfigurationPolicyHandler::CheckPolicySettings(
     const PolicyMap& policies,
     PolicyErrorMap* errors) {
   const base::Value* value;
   if (!CheckAndGetValue(policies, errors, &value))
     return false;
 
   if (value) {
     std::string onc_blob;
     value->GetAsString(&onc_blob);
-    std::string json_error;
     scoped_ptr<base::DictionaryValue> root_dict =
-        onc::ReadDictionaryFromJson(onc_blob, &json_error);
+        onc::ReadDictionaryFromJson(onc_blob);
     if (root_dict.get() == NULL) {
-      errors->AddError(policy_name(), IDS_POLICY_NETWORK_CONFIG_PARSE_ERROR,
-                       json_error);
+      errors->AddError(policy_name(), IDS_POLICY_NETWORK_CONFIG_PARSE_ERROR);
       return false;
     }
 
     // Validate the ONC dictionary. We are liberal and ignore unknown field
     // names and ignore invalid field names in kRecommended arrays.
     onc::Validator validator(false,  // Ignore unknown fields.
                              false,  // Ignore invalid recommended field names.
                              true,  // Fail on missing fields.
                              true);  // Validate for managed ONC
 
@@ skipping 127 matching lines @@
         base::DictionaryValue* app_dict = new base::DictionaryValue();
         app_dict->SetString(ash::kPinnedAppsPrefAppIDPath, id);
         pinned_apps_list->Append(app_dict);
       }
     }
     prefs->SetValue(pref_path(), pinned_apps_list);
   }
 }
 
 }  // namespace policy