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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chromeos/test/data/network/proxy_config.json

Issue 1228543002: Translate ONC ProxySettings <-> Shill ProxyConfig (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add SchemeToString 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 unified diff | Download patch
« chromeos/network/onc/onc_utils.cc ('K') | « chromeos/network/onc/onc_utils_unittest.cc ('k') | chromeos/test/data/network/shill_openvpn_clientcert.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 [ 1 [
2 { "ONC_ProxySettings": { 2 { "ONC_ProxySettings": {
3 "Manual": { 3 "Manual": {
4 "FTPProxy": { 4 "FTPProxy": {
5 "Host": "192.168.2.1", 5 "Host": "192.168.2.1",
6 "Port": 8889 6 "Port": 8889
7 }, 7 },
8 "HTTPProxy": { 8 "HTTPProxy": {
9 "Host": "192.168.2.1", 9 "Host": "192.168.2.1",
10 "Port": 8889 10 "Port": 8889
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 } 75 }
76 }, 76 },
77 { "ONC_ProxySettings": { 77 { "ONC_ProxySettings": {
78 "Type": "Direct" 78 "Type": "Direct"
79 }, 79 },
80 "ProxyConfig": { 80 "ProxyConfig": {
81 "mode": "direct" 81 "mode": "direct"
82 } 82 }
83 } 83 }
84 ] 84 ]
OLDNEW
« chromeos/network/onc/onc_utils.cc ('K') | « chromeos/network/onc/onc_utils_unittest.cc ('k') | chromeos/test/data/network/shill_openvpn_clientcert.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698