Correctly translate Cellular Device properties to ONC

chromeos/test/data/network/shill_cellular_with_state.json

Index: chromeos/test/data/network/shill_cellular_with_state.json
diff --git a/chromeos/test/data/network/shill_cellular_with_state.json b/chromeos/test/data/network/shill_cellular_with_state.json
index 96d0f704331c63be4eaa31d2b52fc87543540d23..b26aaae186f67ba99dab39552724ad185762a18a 100644
--- a/chromeos/test/data/network/shill_cellular_with_state.json
+++ b/chromeos/test/data/network/shill_cellular_with_state.json
@@ -10,38 +10,43 @@
   },
   "Cellular.APN": {
     "apn": "test-apn",
+    "name": "test-apn-name",
     "username": "test-username",
     "password": "test-password"
   },
-  "Cellular.APNList": [
-    {
-      "apn": "test-apn0",
-      "username": "test-username0",
-      "password": "test-password0"
-    },
-    {
-      "apn": "test-apn1",
-      "username": "test-username1",
-      "password": "test-password1"
-    },
-    {
-      "apn": "test-apn2",
-      "username": "test-username2",
-      "password": "test-password2"
-    },
-    {
-      "apn": "test-apn3",
-      "username": "test-username3",
-      "password": "test-password3"
-    }
-  ],
   "Device": {
     // This dictionary contains Device properties and not Service properties as
     // above.
     "Cellular.AllowRoaming": true,
+    "Cellular.APNList": [
+      {
+	"apn": "test-apn0",
+	"username": "test-username0",
+	"password": "test-password0"
+      },
+      {
+	"apn": "test-apn1",
+	"username": "test-username1",
+	"password": "test-password1"
+      },
+      {
+	"apn": "test-apn2",
+	"username": "test-username2",
+	"password": "test-password2"
+      },
+      {
+	"apn": "test-apn3",
+	"username": "test-username3",
+	"password": "test-password3"
+      }
+    ],
     "Cellular.HomeProvider": {
       "country": "us",
       "name": "cellular_provider"
+    },
+    "Cellular.SIMLockStatus": {
+      "LockType": "sim-pin",
+      "LockEnabled": true
     }
   }
 }