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

Unified Diff: chrome/test/data/chromeos/net/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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/data/chromeos/net/proxy_config.json
diff --git a/chrome/test/data/chromeos/net/proxy_config.json b/chrome/test/data/chromeos/net/proxy_config.json
deleted file mode 100644
index 8e122d4e1c6de86725f1feeddfcc557424ce20ad..0000000000000000000000000000000000000000
--- a/chrome/test/data/chromeos/net/proxy_config.json
+++ /dev/null
@@ -1,84 +0,0 @@
-[
- { "ONC_ProxySettings": {
- "Manual": {
- "FTPProxy": {
- "Host": "192.168.2.1",
- "Port": 8889
- },
- "HTTPProxy": {
- "Host": "192.168.2.1",
- "Port": 8889
- },
- "SOCKS": {
- "Host": "192.168.2.1",
- "Port": 8889
- },
- "SecureHTTPProxy": {
- "Host": "192.168.2.1",
- "Port": 8889
- }
- },
- "Type": "Manual"
- },
- "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"
- }
- },
- {
- "ONC_ProxySettings": {
- "Type": "Manual",
- "Manual": {
- "HTTPProxy" : {
- "Host" : "http.example.com",
- "Port" : 1234
- },
- "SecureHTTPProxy" : {
- "Host" : "https.example.com",
- "Port" : 3456
- },
- "FTPProxy" : {
- "Host" : "ftp.example.com",
- "Port" : 5678
- },
- "SOCKS" : {
- "Host" : "socks5://socks.example.com",
- "Port" : 7890
- }
- },
- "ExcludeDomains": [
- "google.com",
- "<local>"
- ]
- },
- "ProxyConfig": {
- "bypass_list":"google.com;\u003Clocal\u003E;",
- "mode":"fixed_servers",
- "server":"ftp=ftp.example.com:5678;http=http.example.com:1234;socks=socks5://socks.example.com:7890;https=https.example.com:3456"
- }
- },
- { "ONC_ProxySettings": {
- "Type": "PAC",
- "PAC": "https://proxycfg.my.domain.com/proxy.dat"
- },
- "ProxyConfig": {
- "mode":"pac_script",
- "pac_mandatory":false,
- "pac_url":"https://proxycfg.my.domain.com/proxy.dat"
- }
- },
- { "ONC_ProxySettings": {
- "Type": "WPAD"
- },
- "ProxyConfig": {
- "mode": "auto_detect"
- }
- },
- { "ONC_ProxySettings": {
- "Type": "Direct"
- },
- "ProxyConfig": {
- "mode": "direct"
- }
- }
-]

Powered by Google App Engine
This is Rietveld 408576698