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

chrome/browser/chromeos/cros/onc_network_parser.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/chromeos/cros/onc_network_parser.h"
 
 #include <keyhi.h>
 #include <pk11pub.h>
 
 #include "base/base64.h"
 #include "base/json/json_string_value_serializer.h"
-#include "chrome/browser/chromeos/login/user_manager.h"
 #include "base/json/json_writer.h"  // for debug output only.
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/certificate_pattern.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/native_network_constants.h"
 #include "chrome/browser/chromeos/cros/native_network_parser.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/cros/onc_constants.h"
-#include "chrome/browser/chromeos/network_settings/onc_certificate_importer.h"
-#include "chrome/browser/chromeos/network_settings/onc_signature.h"
-#include "chrome/browser/chromeos/network_settings/onc_validator.h"
+#include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/common/net/x509_certificate_model.h"
+#include "chromeos/network/onc/onc_certificate_importer.h"
+#include "chromeos/network/onc/onc_constants.h"
+#include "chromeos/network/onc/onc_signature.h"
+#include "chromeos/network/onc/onc_validator.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/encryptor.h"
 #include "crypto/hmac.h"
 #include "crypto/scoped_nss_types.h"
 #include "crypto/symmetric_key.h"
 #include "grit/generated_resources.h"
 #include "net/base/crypto_module.h"
 #include "net/base/net_errors.h"
 #include "net/base/nss_cert_database.h"
 #include "net/base/pem_tokenizer.h"
@@ skipping 236 matching lines @@
     result->push_back(item);
   }
   return true;
 }
 
 }  // namespace
 
 // -------------------- OncNetworkParser --------------------
 
 OncNetworkParser::OncNetworkParser(const base::ListValue& network_configs,
-                                   NetworkUIData::ONCSource onc_source)
+                                   onc::ONCSource onc_source)
     : NetworkParser(get_onc_mapper()),
       onc_source_(onc_source),
       network_configs_(network_configs.DeepCopy()) {
 }
 
 OncNetworkParser::OncNetworkParser()
     : NetworkParser(get_onc_mapper()),
       network_configs_(NULL) {
 }
 
@@ skipping 156 matching lines @@
   if (any_errors) {
     parse_error_ = l10n_util::GetStringUTF8(
         IDS_NETWORK_CONFIG_ERROR_NETWORK_PROP_DICT_MALFORMED);
   }
   return !any_errors;
 }
 
 // static
 std::string OncNetworkParser::GetUserExpandedValue(
     const base::Value& value,
-    NetworkUIData::ONCSource source) {
+    onc::ONCSource source) {
   std::string string_value;
   if (!value.GetAsString(&string_value))
     return string_value;
 
   // If running unit test, just return the original value.
   if (!content::BrowserThread::IsMessageLoopValid(content::BrowserThread::UI))
     return string_value;
 
-  if (source != NetworkUIData::ONC_SOURCE_USER_POLICY &&
-      source != NetworkUIData::ONC_SOURCE_USER_IMPORT) {
+  if (source != onc::ONC_SOURCE_USER_POLICY &&
+      source != onc::ONC_SOURCE_USER_IMPORT) {
     return string_value;
   }
 
   if (!UserManager::Get()->IsUserLoggedIn())
     return string_value;
 
   const User* logged_in_user = UserManager::Get()->GetLoggedInUser();
   ReplaceSubstringsAfterOffset(&string_value, 0,
                                onc::substitutes::kLoginIDField,
                                logged_in_user->GetAccountName(false));
@@ skipping 368 matching lines @@
   return net::ProxyServer(scheme, host_port);
 }
 
 // static
 bool OncNetworkParser::ParseClientCertPattern(OncNetworkParser* parser,
                                               PropertyIndex index,
                                               const base::Value& value,
                                               Network* network) {
   // Ignore certificate patterns for device policy ONC so that an unmanaged user
   // won't have a certificate presented for them involuntarily.
-  if (parser->onc_source() == NetworkUIData::ONC_SOURCE_DEVICE_POLICY)
+  if (parser->onc_source() == onc::ONC_SOURCE_DEVICE_POLICY)
     return false;
 
   // Only WiFi and VPN have this type.
   if (network->type() != TYPE_WIFI &&
       network->type() != TYPE_VPN) {
     LOG(WARNING) << "Tried to parse a ClientCertPattern from something "
                  << "that wasn't a WiFi or VPN network.";
     return false;
   }
 
@@ skipping 635 matching lines @@
     // on the value of AuthenticationType.
     { "L2TP-IPsec", PROVIDER_TYPE_L2TP_IPSEC_PSK },
     { "OpenVPN", PROVIDER_TYPE_OPEN_VPN },
   };
   CR_DEFINE_STATIC_LOCAL(EnumMapper<ProviderType>, parser,
       (table, arraysize(table), PROVIDER_TYPE_MAX));
   return parser.Get(type);
 }
 
 }  // namespace chromeos