diff options
| author | stevenjb <stevenjb@chromium.org> | 2014-09-15 17:54:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-16 00:56:26 +0000 |
| commit | fbe23b5a93835d5a98cf06cf00aebcd6faf6746a (patch) | |
| tree | fbc854ac715c0f132be214f08eb4a8a8d1a87b6f /chromeos/test | |
| parent | 1c8fb8003d7d8e338c0bd277d3ab6bdff97e75df (diff) | |
| download | chromium_src-fbe23b5a93835d5a98cf06cf00aebcd6faf6746a.zip chromium_src-fbe23b5a93835d5a98cf06cf00aebcd6faf6746a.tar.gz chromium_src-fbe23b5a93835d5a98cf06cf00aebcd6faf6746a.tar.bz2 | |
Use ONC carrier info in JS
Also, cleanup internet_options_handler.cc 'showViewAccountButton' code.
BUG=279351
Review URL: https://codereview.chromium.org/561073002
Cr-Commit-Position: refs/heads/master@{#294951}
Diffstat (limited to 'chromeos/test')
| -rw-r--r-- | chromeos/test/data/network/shill_cellular_with_state.json | 7 | ||||
| -rw-r--r-- | chromeos/test/data/network/translation_of_shill_cellular_with_state.onc | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/chromeos/test/data/network/shill_cellular_with_state.json b/chromeos/test/data/network/shill_cellular_with_state.json index 2fd362d..82e3fcb 100644 --- a/chromeos/test/data/network/shill_cellular_with_state.json +++ b/chromeos/test/data/network/shill_cellular_with_state.json @@ -42,6 +42,7 @@ "password": "test-password3" } ], + "Cellular.Carrier": "cellular_provider", "Cellular.HomeProvider": { "country": "us", "name": "cellular_provider" @@ -49,7 +50,11 @@ "Cellular.SIMLockStatus": { "LockType": "sim-pin", "LockEnabled": true - } + }, + "Cellular.SupportedCarriers": [ + "cellular_provider", + "generic_provider" + ], }, "Profile": "/profile/default", } 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 05a09d8..c7e175f 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 @@ -6,6 +6,7 @@ "ActivationType": "OTASP", "AllowRoaming": true, "AutoConnect": true, + "Carrier": "cellular_provider", "HomeProvider": { "country": "us", "name": "cellular_provider" @@ -16,6 +17,10 @@ "Country": "test-country", "Name": "test-name" }, + "SupportedCarriers": [ + "cellular_provider", + "generic_provider" + ], "APN": { "AccessPointName": "test-apn", "Name": "test-apn-name", @@ -39,7 +44,7 @@ "Password": "test-password3", "Username": "test-username3" } - ], + ], "SIMLockStatus": { "LockType": "sim-pin", "LockEnabled": true |