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

Unified Diff: chrome/browser/prefs/tracked/pref_hash_browsertest.cc

Issue 2598033004: Remove old default search preferences. (Closed)
Patch Set: Fixed after review, round 2 Created 3 years, 11 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/prefs/chrome_pref_service_factory.cc ('k') | components/search_engines/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/tracked/pref_hash_browsertest.cc
diff --git a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc
index 5685dca6de8e4388f89779917e6a112020a15f2c..274482512f2a1db0d48b6d1bb06cb4d7eb9eddc6 100644
--- a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc
+++ b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc
@@ -1232,30 +1232,18 @@ class PrefHashBrowserTestDefaultSearch : public PrefHashBrowserTestBase {
}
]
})";
- static constexpr char default_search_provider[] = R"(
- {
- "default_search_provider" : {
- "keyword" : "badkeyword",
- "name" : "badname",
- "search_url" : "http://bad_default_engine/search?q=dirty_user_query"
- }
- })";
// Try to override default search in all three of available preferences.
auto attack1 = base::DictionaryValue::From(
base::JSONReader::Read(default_search_provider_data));
auto attack2 = base::DictionaryValue::From(
base::JSONReader::Read(search_provider_overrides));
- auto attack3 = base::DictionaryValue::From(
- base::JSONReader::Read(default_search_provider));
unprotected_preferences->MergeDictionary(attack1.get());
unprotected_preferences->MergeDictionary(attack2.get());
- unprotected_preferences->MergeDictionary(attack3.get());
if (protected_preferences) {
// Override here, too.
protected_preferences->MergeDictionary(attack1.get());
protected_preferences->MergeDictionary(attack2.get());
- protected_preferences->MergeDictionary(attack3.get());
}
}
« no previous file with comments | « chrome/browser/prefs/chrome_pref_service_factory.cc ('k') | components/search_engines/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698