Replace OncNetworkParser by the new ONC translator.

chrome/test/functional/chromeos_onc.py

Index: chrome/test/functional/chromeos_onc.py
diff --git a/chrome/test/functional/chromeos_onc.py b/chrome/test/functional/chromeos_onc.py
index 478b17da537376581942861c6bc498c6dbca642a..1a7d7e001b3135c9c3fd8fa4252b84ae3714dafe 100755
--- a/chrome/test/functional/chromeos_onc.py
+++ b/chrome/test/functional/chromeos_onc.py
@@ -20,7 +20,7 @@ class ChromeosONC(policy_base.PolicyTestBase):
   add the network/certificate to the device.
   """
 
-  ONC_PATH = os.path.join(pyauto.PyUITest.DataDir(), 'chromeos', 'cros')
+  ONC_PATH = os.path.join(pyauto.PyUITest.ChromeOSDataDir(), 'network')
 
   def setUp(self):
     self.CleanupFlimflamDirsOnChromeOS()
@@ -78,7 +78,7 @@ class ChromeosONC(policy_base.PolicyTestBase):
         'ssid-none': '',
     }
 
-    self._ReadONCFileAndSet('network-wifi-none.onc')
+    self._ReadONCFileAndSet('toplevel_wifi_open.onc')
     self._VerifyRememberedWifiNetworks(wifi_networks)
 
   def testONCAddWEPWifi(self):
@@ -87,7 +87,7 @@ class ChromeosONC(policy_base.PolicyTestBase):
         'ssid-wep': 'WEP',
     }
 
-    self._ReadONCFileAndSet('network-wifi-wep.onc')
+    self._ReadONCFileAndSet('toplevel_wifi_wep_proxy.onc')
     self._VerifyRememberedWifiNetworks(wifi_networks)
 
   def testONCAddPSKWifi(self):
@@ -95,15 +95,15 @@ class ChromeosONC(policy_base.PolicyTestBase):
     wifi_networks = {
         'ssid-wpa': 'WPA',
     }
-    self._ReadONCFileAndSet('network-wifi-wpa.onc')
+    self._ReadONCFileAndSet('toplevel_wifi_wpa_psk.onc')
     self._VerifyRememberedWifiNetworks(wifi_networks)
 
   def testAddBacktoBackONC(self):
     """Test adding three different ONC files one after the other."""
     test_dict = {
-      'network-wifi-none.onc': { 'ssid-none': '' },
-      'network-wifi-wep.onc': { 'ssid-wep': 'WEP' },
-      'network-wifi-wpa.onc': { 'ssid-wpa': 'WPA' },
+      'toplevel_wifi_open.onc': { 'ssid-none': '' },
+      'toplevel_wifi_wep_proxy.onc': { 'ssid-wep': 'WEP' },
+      'toplevel_wifi_wpa_psk.onc': { 'ssid-wpa': 'WPA' },
     }
 
     for onc, wifi_networks in test_dict.iteritems():
@@ -122,9 +122,9 @@ class ChromeosONC(policy_base.PolicyTestBase):
       'ssid-wpa': 'WPA',
     }
 
-    self._ReadONCFileAndSet('network-wifi-none.onc')
-    self._ReadONCFileAndSet('network-wifi-wep.onc')
-    self._ReadONCFileAndSet('network-wifi-wpa.onc')
+    self._ReadONCFileAndSet('toplevel_wifi_open.onc')
+    self._ReadONCFileAndSet('toplevel_wifi_wep_proxy.onc')
+    self._ReadONCFileAndSet('toplevel_wifi_wpa_psk.onc')
 
     # Verify that only the most recent onc is updated.
     self._VerifyRememberedWifiNetworks(wifi_networks)
@@ -136,7 +136,7 @@ class ChromeosONC(policy_base.PolicyTestBase):
         'ssid-wpa': 'WPA'
     }
 
-    self._ReadONCFileAndSet('network-multiple-unknown.onc')
+    self._ReadONCFileAndSet('toplevel_with_unknown_fields.onc')
     self._VerifyRememberedWifiNetworks(wifi_networks)