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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 268643002: Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Last test fix? Created 6 years, 7 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
« chrome/browser/search_engines/util.cc ('K') | « chrome/browser/ui/search_engines/keyword_editor_controller_unittest.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 f3310d4333ce2b011365a81899049767676d8b98..8cc6eb3d144241165f2d43554d502b5856fb9e11 100644
--- a/chrome/test/data/policy/policy_test_cases.json
+++ b/chrome/test/data/policy/policy_test_cases.json
@@ -739,7 +739,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderEnabled": false },
"pref_mappings": [
- { "pref": "default_search_provider.enabled",
+ { "pref": "default_search_provider_data.template_url_data",
"indicator_tests": [
{ "policy": { "DefaultSearchProviderEnabled": false } },
{ "policy": { "DefaultSearchProviderEnabled": true, "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google" } }
@@ -752,7 +752,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google", "DefaultSearchProviderName": "google.com" },
"pref_mappings": [
- { "pref": "default_search_provider.name" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
@@ -760,7 +760,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google" },
"pref_mappings": [
- { "pref": "default_search_provider.keyword" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
@@ -768,7 +768,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google" },
"pref_mappings": [
- { "pref": "default_search_provider.search_url",
+ { "pref": "default_search_provider_data.template_url_data",
"indicator_selector": "[setting=search-engine]",
"indicator_tests": [
{ "policy": { "DefaultSearchProviderEnabled": true, "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}" } }
@@ -781,7 +781,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google", "DefaultSearchProviderSuggestURL": "http://www.google.com/suggest?q={searchTerms}" },
"pref_mappings": [
- { "pref": "default_search_provider.suggest_url" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
@@ -789,7 +789,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google", "DefaultSearchProviderInstantURL": "http://www.google.com/instant?q={searchTerms}" },
"pref_mappings": [
- { "pref": "default_search_provider.instant_url" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
@@ -797,7 +797,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google", "DefaultSearchProviderNewTabURL": "http://www.google.com/newtab" },
"pref_mappings": [
- { "pref": "default_search_provider.new_tab_url" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
@@ -805,7 +805,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google", "DefaultSearchProviderIconURL": "http://www.google.com/favicon.ico" },
"pref_mappings": [
- { "pref": "default_search_provider.icon_url" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
@@ -813,7 +813,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google", "DefaultSearchProviderEncodings": ["UTF-8"] },
"pref_mappings": [
- { "pref": "default_search_provider.encodings" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
@@ -821,7 +821,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google", "DefaultSearchProviderAlternateURLs": ["http://www.google.com/#q={searchTerms}", "http://www.google.com/search#q={searchTerms}"] },
"pref_mappings": [
- { "pref": "default_search_provider.alternate_urls" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
@@ -829,7 +829,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google", "DefaultSearchProviderSearchTermsReplacementKey": "espv" },
"pref_mappings": [
- { "pref": "default_search_provider.search_terms_replacement_key" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
@@ -837,7 +837,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google", "DefaultSearchProviderImageURL": "http://www.google.com/searchbyimage/upload" },
"pref_mappings": [
- { "pref": "default_search_provider.image_url" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
@@ -845,7 +845,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google", "DefaultSearchProviderSearchURLPostParams": "" },
"pref_mappings": [
- { "pref": "default_search_provider.search_url_post_params" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
@@ -853,7 +853,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google", "DefaultSearchProviderSuggestURLPostParams": "" },
"pref_mappings": [
- { "pref": "default_search_provider.suggest_url_post_params" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
@@ -861,7 +861,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google", "DefaultSearchProviderInstantURLPostParams": "" },
"pref_mappings": [
- { "pref": "default_search_provider.instant_url_post_params" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
@@ -869,7 +869,7 @@
"os": ["win", "linux", "mac", "chromeos"],
"test_policy": { "DefaultSearchProviderSearchURL": "http://www.google.com/?q={searchTerms}", "DefaultSearchProviderKeyword": "google", "DefaultSearchProviderImageURLPostParams": "image_content={imageThumbnail},image_url={imageURL},sbisrc={imageSearchSource}" },
"pref_mappings": [
- { "pref": "default_search_provider.image_url_post_params" }
+ { "pref": "default_search_provider_data.template_url_data" }
]
},
« chrome/browser/search_engines/util.cc ('K') | « chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698