Correctly translate Cellular Device properties to ONC

This fixes how we translate the Device properties to ONC instead of
just copying the Shill properties.

BUG=279351

Review URL: https://codereview.chromium.org/402953004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285642 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 32 insertions, 23 deletions

diff --git a/chromeos/test/data/network/shill_cellular_with_state.json b/chromeos/test/data/network/shill_cellular_with_state.json
index 96d0f70..b26aaae 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
     }
   }
 }
diff --git a/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc b/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
index 0ce9ce7..ee290f5 100644
--- a/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
+++ b/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
@@ -36,6 +36,10 @@
         "Password": "test-password3",
         "Username": "test-username3"
       }
-    ]
+    ],
+    "SIMLockStatus": {
+      "LockType": "sim-pin",
+      "LockEnabled": true
+    }
   }
 }