summaryrefslogtreecommitdiffstats
path: root/chromeos/test
diff options
context:
space:
mode:
authorstevenjb <stevenjb@chromium.org>2015-04-09 12:50:07 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-09 19:50:46 +0000
commitb7d10c9a1d93e53fa8e706d62db8a4bb68b2381d (patch)
tree51619ec2120eb48ffd0af5a85ed1b8a63df91eef /chromeos/test
parentfe53e50cf943cf2fa352e41e5343ea1a1d331570 (diff)
downloadchromium_src-b7d10c9a1d93e53fa8e706d62db8a4bb68b2381d.zip
chromium_src-b7d10c9a1d93e53fa8e706d62db8a4bb68b2381d.tar.gz
chromium_src-b7d10c9a1d93e53fa8e706d62db8a4bb68b2381d.tar.bz2
Replace Settings cellular carrier and activation with networkingPrivate
This uses the recent networkingPrivate changes to support setting Cellular.Carrier in setProperties and adding startActivate in internet_details.js. BUG=430115 Review URL: https://codereview.chromium.org/1046593003 Cr-Commit-Position: refs/heads/master@{#324490}
Diffstat (limited to 'chromeos/test')
-rw-r--r--chromeos/test/data/network/shill_cellular_with_state.json4
-rw-r--r--chromeos/test/data/network/translation_of_shill_cellular_with_state.onc4
2 files changed, 8 insertions, 0 deletions
diff --git a/chromeos/test/data/network/shill_cellular_with_state.json b/chromeos/test/data/network/shill_cellular_with_state.json
index 149eeac..a330e70 100644
--- a/chromeos/test/data/network/shill_cellular_with_state.json
+++ b/chromeos/test/data/network/shill_cellular_with_state.json
@@ -5,6 +5,10 @@
"Cellular.ActivationState": "activated",
"Cellular.ActivationType": "OTASP",
"Cellular.NetworkTechnology": "LTE Advanced",
+ "Cellular.Olp": {
+ "method": "GET",
+ "url": "http://test.com/payment"
+ },
"Cellular.RoamingState": "home",
"Cellular.ServingOperator": {
"code": "test-code",
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 da0b0d87..d90db84 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
@@ -12,6 +12,10 @@
"Name": "cellular_provider"
},
"NetworkTechnology": "LTEAdvanced",
+ "PaymentPortal": {
+ "Method": "GET",
+ "Url": "http://test.com/payment"
+ },
"RoamingState": "Home",
"ServingOperator": {
"Code": "test-code",