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

chrome/browser/chromeos/cros/network_ui_data.cc

Index: chrome/browser/chromeos/cros/network_ui_data.cc
diff --git a/chrome/browser/chromeos/cros/network_ui_data.cc b/chrome/browser/chromeos/cros/network_ui_data.cc
index b2c0e3eec47b6c87c11976cee9ec5e39a98fb3ff..55dd4f2a6841bac0ec790e02dc484f8246b2b6d4 100644
--- a/chrome/browser/chromeos/cros/network_ui_data.cc
+++ b/chrome/browser/chromeos/cros/network_ui_data.cc
@@ -15,11 +15,11 @@ const char NetworkUIData::kKeyCertificatePattern[] = "certificate_pattern";
 const char NetworkUIData::kKeyCertificateType[] = "certificate_type";
 
 // Property names for per-property data stored under |kKeyProperties|.
-const EnumMapper<NetworkUIData::ONCSource>::Pair
+const EnumMapper<onc::ONCSource>::Pair
     NetworkUIData::kONCSourceTable[] =  {
-  { "user_import", NetworkUIData::ONC_SOURCE_USER_IMPORT },
-  { "device_policy", NetworkUIData::ONC_SOURCE_DEVICE_POLICY },
-  { "user_policy", NetworkUIData::ONC_SOURCE_USER_POLICY },
+  { "user_import", onc::ONC_SOURCE_USER_IMPORT },
+  { "device_policy", onc::ONC_SOURCE_DEVICE_POLICY },
+  { "user_policy", onc::ONC_SOURCE_USER_POLICY },
 };
 
 // Property names for per-property data stored under |kKeyProperties|.
@@ -35,7 +35,7 @@ const char NetworkPropertyUIData::kKeyController[] = "controller";
 const char NetworkPropertyUIData::kKeyDefaultValue[] = "default_value";
 
 NetworkUIData::NetworkUIData()
-    : onc_source_(ONC_SOURCE_NONE),
+    : onc_source_(onc::ONC_SOURCE_NONE),
       certificate_type_(CLIENT_CERT_TYPE_NONE) {
 }
 
@@ -44,7 +44,7 @@ NetworkUIData::NetworkUIData(const DictionaryValue& dict) {
   if (dict.GetString(kKeyONCSource, &source)) {
     onc_source_ = GetONCSourceMapper().Get(source);
   } else {
-    onc_source_ = ONC_SOURCE_NONE;
+    onc_source_ = onc::ONC_SOURCE_NONE;
   }
   const DictionaryValue* cert_dict = NULL;
   if (dict.GetDictionary(kKeyCertificatePattern, &cert_dict) && cert_dict)
@@ -87,10 +87,10 @@ void NetworkUIData::FillDictionary(base::DictionaryValue* dict) const {
 }
 
 // static
-EnumMapper<NetworkUIData::ONCSource>& NetworkUIData::GetONCSourceMapper() {
-  CR_DEFINE_STATIC_LOCAL(EnumMapper<ONCSource>, mapper,
+EnumMapper<onc::ONCSource>& NetworkUIData::GetONCSourceMapper() {
+  CR_DEFINE_STATIC_LOCAL(EnumMapper<onc::ONCSource>, mapper,
                          (kONCSourceTable, arraysize(kONCSourceTable),
-                          ONC_SOURCE_NONE));
+                          onc::ONC_SOURCE_NONE));
   return mapper;
 }