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

Unified Diff: chrome/test/data/policy/policy_test_cases.json

Issue 11189060: Add controlled setting indicator for proxy configuration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-add accidentally deleted blank line. Created 8 years, 2 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
« no previous file with comments | « chrome/browser/ui/webui/options/core_options_handler.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/policy/policy_test_cases.json
diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json
index 98bdf17b1d562fba598fc81c6479ce86a205fcf3..1897ddada4a9fe85455907724c4108dfcdb2721b 100644
--- a/chrome/test/data/policy/policy_test_cases.json
+++ b/chrome/test/data/policy/policy_test_cases.json
@@ -462,7 +462,11 @@
"test_policy": { "ProxyMode": "direct" },
"settings_pages": [],
"pref_mappings": [
- { "pref": "proxy" }
+ { "pref": "proxy",
+ "indicator_tests": [
+ { "policy": { "ProxyMode": "direct" } }
+ ]
+ }
],
"note": "TODO(joaodasilva): Should be chrome://settings-frame. http://crbug.com/97749"
@@ -473,7 +477,11 @@
"test_policy": { "ProxyServerMode": 0 },
"settings_pages": [],
"pref_mappings": [
- { "pref": "proxy" }
+ { "pref": "proxy",
+ "indicator_tests": [
+ { "policy": { "ProxyServerMode": 0 } }
+ ]
+ }
],
"note": "TODO(joaodasilva): Should be chrome://settings-frame. http://crbug.com/97749"
@@ -484,7 +492,11 @@
"test_policy": { "ProxyMode": "fixed_servers", "ProxyServer": "http://localhost:8080" },
"settings_pages": [],
"pref_mappings": [
- { "pref": "proxy" }
+ { "pref": "proxy",
+ "indicator_tests": [
+ { "policy": { "ProxyMode": "fixed_servers", "ProxyServer": "http://localhost:8080" } }
+ ]
+ }
]
},
@@ -493,7 +505,11 @@
"test_policy": { "ProxyMode": "pac_script", "ProxyPacUrl": "http://localhost:8080/proxy.pac" },
"settings_pages": [],
"pref_mappings": [
- { "pref": "proxy" }
+ { "pref": "proxy",
+ "indicator_tests": [
+ { "policy": { "ProxyMode": "pac_script", "ProxyPacUrl": "http://localhost:8080/proxy.pac" } }
+ ]
+ }
]
},
@@ -502,7 +518,11 @@
"test_policy": { "ProxyMode": "fixed_servers", "ProxyServer": "http://localhost:8080", "ProxyBypassList": "localhost" },
"settings_pages": [],
"pref_mappings": [
- { "pref": "proxy" }
+ { "pref": "proxy",
+ "indicator_tests": [
+ { "policy": { "ProxyMode": "fixed_servers", "ProxyServer": "http://localhost:8080", "ProxyBypassList": "localhost" } }
+ ]
+ }
]
},
@@ -511,7 +531,11 @@
"test_policy": { "ProxySettings": { "ProxyMode": "direct" } },
"settings_pages": [],
"pref_mappings": [
- { "pref": "proxy" }
+ { "pref": "proxy",
+ "indicator_tests": [
+ { "policy": { "ProxySettings": { "ProxyMode": "direct" } } }
+ ]
+ }
]
},
« no previous file with comments | « chrome/browser/ui/webui/options/core_options_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698