Index: components/search_engines/default_search_policy_handler.cc |
diff --git a/components/search_engines/default_search_policy_handler.cc b/components/search_engines/default_search_policy_handler.cc |
index 7c742da59031f4b2c2becd2d36e37c2c994781b9..876827d60c055e700f9818a5a3fce2c6076de8e2 100644 |
--- a/components/search_engines/default_search_policy_handler.cc |
+++ b/components/search_engines/default_search_policy_handler.cc |
@@ -62,95 +62,96 @@ void SetStringInPref(const PolicyMap& policies, |
const PolicyToPreferenceMapEntry kDefaultSearchPolicyMap[] = { |
{ key::kDefaultSearchProviderEnabled, |
prefs::kDefaultSearchProviderEnabled, |
- base::Value::TYPE_BOOLEAN }, |
+ base::Value::Type::BOOLEAN }, |
{ key::kDefaultSearchProviderName, |
prefs::kDefaultSearchProviderName, |
- base::Value::TYPE_STRING }, |
+ base::Value::Type::STRING }, |
{ key::kDefaultSearchProviderKeyword, |
prefs::kDefaultSearchProviderKeyword, |
- base::Value::TYPE_STRING }, |
+ base::Value::Type::STRING }, |
{ key::kDefaultSearchProviderSearchURL, |
prefs::kDefaultSearchProviderSearchURL, |
- base::Value::TYPE_STRING }, |
+ base::Value::Type::STRING }, |
{ key::kDefaultSearchProviderSuggestURL, |
prefs::kDefaultSearchProviderSuggestURL, |
- base::Value::TYPE_STRING }, |
+ base::Value::Type::STRING }, |
{ key::kDefaultSearchProviderInstantURL, |
prefs::kDefaultSearchProviderInstantURL, |
- base::Value::TYPE_STRING }, |
+ base::Value::Type::STRING }, |
{ key::kDefaultSearchProviderIconURL, |
prefs::kDefaultSearchProviderIconURL, |
- base::Value::TYPE_STRING }, |
+ base::Value::Type::STRING }, |
{ key::kDefaultSearchProviderEncodings, |
prefs::kDefaultSearchProviderEncodings, |
- base::Value::TYPE_LIST }, |
+ base::Value::Type::LIST }, |
{ key::kDefaultSearchProviderAlternateURLs, |
prefs::kDefaultSearchProviderAlternateURLs, |
- base::Value::TYPE_LIST }, |
+ base::Value::Type::LIST }, |
{ key::kDefaultSearchProviderSearchTermsReplacementKey, |
prefs::kDefaultSearchProviderSearchTermsReplacementKey, |
- base::Value::TYPE_STRING }, |
+ base::Value::Type::STRING }, |
{ key::kDefaultSearchProviderImageURL, |
prefs::kDefaultSearchProviderImageURL, |
- base::Value::TYPE_STRING }, |
+ base::Value::Type::STRING }, |
{ key::kDefaultSearchProviderNewTabURL, |
prefs::kDefaultSearchProviderNewTabURL, |
- base::Value::TYPE_STRING }, |
+ base::Value::Type::STRING }, |
{ key::kDefaultSearchProviderSearchURLPostParams, |
prefs::kDefaultSearchProviderSearchURLPostParams, |
- base::Value::TYPE_STRING }, |
+ base::Value::Type::STRING }, |
{ key::kDefaultSearchProviderSuggestURLPostParams, |
prefs::kDefaultSearchProviderSuggestURLPostParams, |
- base::Value::TYPE_STRING }, |
+ base::Value::Type::STRING }, |
{ key::kDefaultSearchProviderInstantURLPostParams, |
prefs::kDefaultSearchProviderInstantURLPostParams, |
- base::Value::TYPE_STRING }, |
+ base::Value::Type::STRING }, |
{ key::kDefaultSearchProviderImageURLPostParams, |
prefs::kDefaultSearchProviderImageURLPostParams, |
- base::Value::TYPE_STRING }, |
+ base::Value::Type::STRING }, |
}; |
// List of policy types to preference names, for policies affecting the default |
// search provider. |
const PolicyToPreferenceMapEntry kDefaultSearchPolicyDataMap[] = { |
{key::kDefaultSearchProviderName, DefaultSearchManager::kShortName, |
- base::Value::TYPE_STRING}, |
+ base::Value::Type::STRING}, |
{key::kDefaultSearchProviderKeyword, DefaultSearchManager::kKeyword, |
- base::Value::TYPE_STRING}, |
+ base::Value::Type::STRING}, |
{key::kDefaultSearchProviderSearchURL, DefaultSearchManager::kURL, |
- base::Value::TYPE_STRING}, |
+ base::Value::Type::STRING}, |
{key::kDefaultSearchProviderSuggestURL, |
- DefaultSearchManager::kSuggestionsURL, base::Value::TYPE_STRING}, |
+ DefaultSearchManager::kSuggestionsURL, base::Value::Type::STRING}, |
{key::kDefaultSearchProviderInstantURL, DefaultSearchManager::kInstantURL, |
- base::Value::TYPE_STRING}, |
+ base::Value::Type::STRING}, |
{key::kDefaultSearchProviderIconURL, DefaultSearchManager::kFaviconURL, |
- base::Value::TYPE_STRING}, |
+ base::Value::Type::STRING}, |
{key::kDefaultSearchProviderEncodings, |
- DefaultSearchManager::kInputEncodings, base::Value::TYPE_LIST}, |
+ DefaultSearchManager::kInputEncodings, base::Value::Type::LIST}, |
{key::kDefaultSearchProviderAlternateURLs, |
- DefaultSearchManager::kAlternateURLs, base::Value::TYPE_LIST}, |
+ DefaultSearchManager::kAlternateURLs, base::Value::Type::LIST}, |
{key::kDefaultSearchProviderSearchTermsReplacementKey, |
DefaultSearchManager::kSearchTermsReplacementKey, |
- base::Value::TYPE_STRING}, |
+ base::Value::Type::STRING}, |
{key::kDefaultSearchProviderImageURL, DefaultSearchManager::kImageURL, |
- base::Value::TYPE_STRING}, |
+ base::Value::Type::STRING}, |
{key::kDefaultSearchProviderNewTabURL, DefaultSearchManager::kNewTabURL, |
- base::Value::TYPE_STRING}, |
+ base::Value::Type::STRING}, |
{key::kDefaultSearchProviderSearchURLPostParams, |
- DefaultSearchManager::kSearchURLPostParams, base::Value::TYPE_STRING}, |
+ DefaultSearchManager::kSearchURLPostParams, base::Value::Type::STRING}, |
{key::kDefaultSearchProviderSuggestURLPostParams, |
- DefaultSearchManager::kSuggestionsURLPostParams, base::Value::TYPE_STRING}, |
+ DefaultSearchManager::kSuggestionsURLPostParams, |
+ base::Value::Type::STRING}, |
{key::kDefaultSearchProviderInstantURLPostParams, |
- DefaultSearchManager::kInstantURLPostParams, base::Value::TYPE_STRING}, |
+ DefaultSearchManager::kInstantURLPostParams, base::Value::Type::STRING}, |
{key::kDefaultSearchProviderImageURLPostParams, |
- DefaultSearchManager::kImageURLPostParams, base::Value::TYPE_STRING}, |
+ DefaultSearchManager::kImageURLPostParams, base::Value::Type::STRING}, |
}; |
// DefaultSearchEncodingsPolicyHandler implementation -------------------------- |
DefaultSearchEncodingsPolicyHandler::DefaultSearchEncodingsPolicyHandler() |
: TypeCheckingPolicyHandler(key::kDefaultSearchProviderEncodings, |
- base::Value::TYPE_LIST) {} |
+ base::Value::Type::LIST) {} |
DefaultSearchEncodingsPolicyHandler::~DefaultSearchEncodingsPolicyHandler() { |
} |
@@ -247,13 +248,13 @@ void DefaultSearchPolicyHandler::ApplyPolicySettings(const PolicyMap& policies, |
for (size_t i = 0; i < arraysize(kDefaultSearchPolicyDataMap); ++i) { |
const char* policy_name = kDefaultSearchPolicyDataMap[i].policy_name; |
switch (kDefaultSearchPolicyDataMap[i].value_type) { |
- case base::Value::TYPE_STRING: |
+ case base::Value::Type::STRING: |
SetStringInPref(policies, |
policy_name, |
kDefaultSearchPolicyDataMap[i].preference_path, |
dict.get()); |
break; |
- case base::Value::TYPE_LIST: |
+ case base::Value::Type::LIST: |
SetListInPref(policies, |
policy_name, |
kDefaultSearchPolicyDataMap[i].preference_path, |