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

chrome/browser/policy/network_configuration_updater_unittest.cc

Index: chrome/browser/policy/network_configuration_updater_unittest.cc
diff --git a/chrome/browser/policy/network_configuration_updater_unittest.cc b/chrome/browser/policy/network_configuration_updater_unittest.cc
index 64c47cd8531cfec788ca09f98b9201ce60817099..4aae523d463cafbf8f56f57d697d8a7c07f30c69 100644
--- a/chrome/browser/policy/network_configuration_updater_unittest.cc
+++ b/chrome/browser/policy/network_configuration_updater_unittest.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/policy_service_impl.h"
+#include "chromeos/network/onc/onc_constants.h"
 #include "policy/policy_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -42,13 +43,13 @@ class NetworkConfigurationUpdaterTest
   }
 
   // Maps configuration policy name to corresponding ONC source.
-  static chromeos::NetworkUIData::ONCSource NameToONCSource(
+  static chromeos::onc::ONCSource NameToONCSource(
       const std::string& name) {
     if (name == key::kDeviceOpenNetworkConfiguration)
-      return chromeos::NetworkUIData::ONC_SOURCE_DEVICE_POLICY;
+      return chromeos::onc::ONC_SOURCE_DEVICE_POLICY;
     if (name == key::kOpenNetworkConfiguration)
-      return chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY;
-    return chromeos::NetworkUIData::ONC_SOURCE_NONE;
+      return chromeos::onc::ONC_SOURCE_USER_POLICY;
+    return chromeos::onc::ONC_SOURCE_NONE;
   }
 
   chromeos::MockNetworkLibrary network_library_;
@@ -69,7 +70,7 @@ TEST_P(NetworkConfigurationUpdaterTest, InitialUpdates) {
   const char* device_onc = GetParam() == key::kDeviceOpenNetworkConfiguration ?
       kFakeONC : kEmptyConfiguration;
   EXPECT_CALL(network_library_, LoadOncNetworks(
-      device_onc, "", chromeos::NetworkUIData::ONC_SOURCE_DEVICE_POLICY, _, _));
+      device_onc, "", chromeos::onc::ONC_SOURCE_DEVICE_POLICY, _, _));
 
   {
     NetworkConfigurationUpdater updater(policy_service_.get(),
@@ -149,11 +150,11 @@ TEST_P(NetworkConfigurationUpdaterTest, PolicyChange) {
     // implementation, we always apply both policies.
     EXPECT_CALL(network_library_, LoadOncNetworks(
         kEmptyConfiguration, "",
-        chromeos::NetworkUIData::ONC_SOURCE_DEVICE_POLICY, _, _));
+        chromeos::onc::ONC_SOURCE_DEVICE_POLICY, _, _));
 
     EXPECT_CALL(network_library_, LoadOncNetworks(
         kEmptyConfiguration, "",
-        chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY, _, _));
+        chromeos::onc::ONC_SOURCE_USER_POLICY, _, _));
 
     EXPECT_CALL(network_library_, RemoveNetworkProfileObserver(_));