Index: components/search_engines/default_search_manager_unittest.cc |
diff --git a/components/search_engines/default_search_manager_unittest.cc b/components/search_engines/default_search_manager_unittest.cc |
index 49aa45c4a8ad6f7fd1c4aa2964f62035423c223d..f2a58e6c904f2ef9d760821df29c3521f9b917e6 100644 |
--- a/components/search_engines/default_search_manager_unittest.cc |
+++ b/components/search_engines/default_search_manager_unittest.cc |
@@ -18,6 +18,7 @@ |
#include "components/pref_registry/testing_pref_service_syncable.h" |
#include "components/search_engines/search_engines_pref_names.h" |
#include "components/search_engines/template_url_data.h" |
+#include "components/search_engines/template_url_data_util.h" |
#include "components/search_engines/template_url_prepopulate_data.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -89,35 +90,8 @@ void SetPolicy(user_prefs::TestingPrefServiceSyncable* prefs, |
EXPECT_FALSE(data->keyword().empty()); |
EXPECT_FALSE(data->url().empty()); |
} |
- std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue); |
- entry->SetString(DefaultSearchManager::kShortName, data->short_name()); |
- entry->SetString(DefaultSearchManager::kKeyword, data->keyword()); |
- entry->SetString(DefaultSearchManager::kURL, data->url()); |
- entry->SetString(DefaultSearchManager::kFaviconURL, data->favicon_url.spec()); |
- entry->SetString(DefaultSearchManager::kSuggestionsURL, |
- data->suggestions_url); |
- entry->SetBoolean(DefaultSearchManager::kSafeForAutoReplace, |
- data->safe_for_autoreplace); |
- std::unique_ptr<base::ListValue> alternate_urls(new base::ListValue); |
- for (std::vector<std::string>::const_iterator it = |
- data->alternate_urls.begin(); |
- it != data->alternate_urls.end(); |
- ++it) { |
- alternate_urls->AppendString(*it); |
- } |
- entry->Set(DefaultSearchManager::kAlternateURLs, alternate_urls.release()); |
- |
- std::unique_ptr<base::ListValue> encodings(new base::ListValue); |
- for (std::vector<std::string>::const_iterator it = |
- data->input_encodings.begin(); |
- it != data->input_encodings.end(); |
- ++it) { |
- encodings->AppendString(*it); |
- } |
- entry->Set(DefaultSearchManager::kInputEncodings, encodings.release()); |
- |
- entry->SetString(DefaultSearchManager::kSearchTermsReplacementKey, |
- data->search_terms_replacement_key); |
+ std::unique_ptr<base::DictionaryValue> entry( |
+ TemplateURLDataToDictionary(*data)); |
entry->SetBoolean(DefaultSearchManager::kDisabledByPolicy, !enabled); |
prefs->SetManagedPref(kDefaultSearchProviderData, entry.release()); |
} |