Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: chromeos/test/data/network/shill_wifi_psk.json

Issue 1228543002: Translate ONC ProxySettings <-> Shill ProxyConfig (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/test/data/network/shill_wifi_psk.json
diff --git a/chromeos/test/data/network/shill_wifi_psk.json b/chromeos/test/data/network/shill_wifi_psk.json
index ccbe176faee2428bcd16edf0672c8f45a705c614..2ba3b5d5db4c899f7cfb513d4d9715288e70ed3f 100644
--- a/chromeos/test/data/network/shill_wifi_psk.json
+++ b/chromeos/test/data/network/shill_wifi_psk.json
@@ -3,6 +3,7 @@
"GUID": "{64c4f86b-cf6a-4e4a-8eff-456def}",
"Mode": "managed",
"Passphrase": "some passphrase",
+ "ProxyConfig": "{\"mode\":\"fixed_servers\",\"server\":\"ftp=192.168.2.1:8889;http=192.168.2.1:8889;socks=socks4://192.168.2.1:8889;https=192.168.2.1:8889\"}",
"SecurityClass": "psk",
"Type": "wifi",
"WiFi.HexSSID": "4F70656E577274", // "OpenWrt"

Powered by Google App Engine
This is Rietveld 408576698