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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/search_engines/default_search_policy_handler_unittest.cc

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: Review comments. 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/default_search_manager.cc ('K') | « chrome/browser/search_engines/default_search_policy_handler.cc ('k') | chrome/browser/search_engines/default_search_pref_migration.cc » ('j') | chrome/browser/search_engines/default_search_pref_migration.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search_engines/default_search_policy_handler_unittest.cc
diff --git a/chrome/browser/search_engines/default_search_policy_handler_unittest.cc b/chrome/browser/search_engines/default_search_policy_handler_unittest.cc
index 8dea354f22ded22e7066bddf968e18628f5e28f4..80cb3bd24e7528bf8be2af108f28c193034c8ced 100644
--- a/chrome/browser/search_engines/default_search_policy_handler_unittest.cc
+++ b/chrome/browser/search_engines/default_search_policy_handler_unittest.cc
@@ -127,192 +127,55 @@ TEST_F(DefaultSearchPolicyHandlerTest, MinimallyDefined) {
NULL);
UpdateProviderPolicy(policy);
- const base::Value* value = NULL;
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderSearchURL, &value));
- EXPECT_TRUE(base::StringValue(kSearchURL).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderName, &value));
- EXPECT_TRUE(base::StringValue(kHostName).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderKeyword, &value));
- EXPECT_TRUE(base::StringValue(kHostName).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderSuggestURL,
- &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderIconURL, &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderEncodings, &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderInstantURL,
- &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
+ const base::Value* temp = NULL;
+ const base::DictionaryValue* dictionary;
+ std::string value;
+ const base::ListValue* list_value;
Peter Kasting 2014/05/07 23:38:29 Nit: Declare these locals just above the first lin
erikwright (departed) 2014/05/08 12:46:24 Done.
+ EXPECT_TRUE(store_->GetValue(kDefaultSearchProviderData, &temp));
+ temp->GetAsDictionary(&dictionary);
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderAlternateURLs,
- &value));
- EXPECT_TRUE(base::ListValue().Equals(value));
+ // Name and keyword should be derived from host.
+ EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kURL, &value));
+ EXPECT_EQ(kSearchURL, value);
+ EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kShortName, &value));
+ EXPECT_EQ(kHostName, value);
+ EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kKeyword, &value));
+ EXPECT_EQ(kHostName, value);
+ // Everything else should be set to the default value.
EXPECT_TRUE(
- store_->GetValue(prefs::kDefaultSearchProviderSearchTermsReplacementKey,
- &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderImageURL, &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(
- prefs::kDefaultSearchProviderSearchURLPostParams, &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(
- prefs::kDefaultSearchProviderSuggestURLPostParams, &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(
- prefs::kDefaultSearchProviderInstantURLPostParams, &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(
- prefs::kDefaultSearchProviderImageURLPostParams, &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(
- prefs::kDefaultSearchProviderNewTabURL, &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
-}
-
-// Checks that for a fully defined search policy, all elements have been
-// read properly.
-TEST_F(DefaultSearchPolicyHandlerTest, FullyDefined) {
- PolicyMap policy;
- BuildDefaultSearchPolicy(&policy);
- UpdateProviderPolicy(policy);
-
- const base::Value* value = NULL;
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderSearchURL, &value));
- EXPECT_TRUE(base::StringValue(kSearchURL).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderName, &value));
- EXPECT_TRUE(base::StringValue(kName).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderKeyword, &value));
- EXPECT_TRUE(base::StringValue(kKeyword).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderSuggestURL,
- &value));
- EXPECT_TRUE(base::StringValue(kSuggestURL).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderIconURL, &value));
- EXPECT_TRUE(base::StringValue(kIconURL).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderEncodings, &value));
- EXPECT_TRUE(base::StringValue("UTF-16;UTF-8").Equals(value));
-
- EXPECT_TRUE(store_->GetValue(
- prefs::kDefaultSearchProviderAlternateURLs, &value));
- EXPECT_TRUE(default_alternate_urls_.Equals(value));
-
+ dictionary->GetString(DefaultSearchManager::kSuggestionsURL, &value));
+ EXPECT_EQ(std::string(), value);
+ EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kFaviconURL, &value));
+ EXPECT_EQ(std::string(), value);
EXPECT_TRUE(
- store_->GetValue(prefs::kDefaultSearchProviderSearchTermsReplacementKey,
- &value));
- EXPECT_TRUE(base::StringValue(kReplacementKey).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderImageURL, &value));
- EXPECT_TRUE(base::StringValue(std::string(kImageURL)).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderImageURLPostParams,
- &value));
- EXPECT_TRUE(base::StringValue(std::string(kImageParams)).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(
- prefs::kDefaultSearchProviderSearchURLPostParams, &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(
- prefs::kDefaultSearchProviderSuggestURLPostParams, &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
-
- EXPECT_TRUE(store_->GetValue(
- prefs::kDefaultSearchProviderInstantURLPostParams, &value));
- EXPECT_TRUE(base::StringValue(std::string()).Equals(value));
-}
-
-// Checks that if the default search policy is missing, that no elements of the
-// default search policy will be present.
-TEST_F(DefaultSearchPolicyHandlerTest, MissingUrl) {
- PolicyMap policy;
- BuildDefaultSearchPolicy(&policy);
- policy.Erase(key::kDefaultSearchProviderSearchURL);
- UpdateProviderPolicy(policy);
-
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderSearchURL, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderName, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderKeyword, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderSuggestURL, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderIconURL, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderEncodings, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderAlternateURLs,
- NULL));
- EXPECT_FALSE(store_->GetValue(
- prefs::kDefaultSearchProviderSearchTermsReplacementKey, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderImageURL, NULL));
- EXPECT_FALSE(store_->GetValue(
- prefs::kDefaultSearchProviderImageURLPostParams, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderInstantURL, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderNewTabURL, NULL));
-}
-
-// Checks that if the default search policy is invalid, that no elements of the
-// default search policy will be present.
-TEST_F(DefaultSearchPolicyHandlerTest, Invalid) {
- PolicyMap policy;
- BuildDefaultSearchPolicy(&policy);
- const char bad_search_url[] = "http://test.com/noSearchTerms";
- policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- base::Value::CreateStringValue(bad_search_url), NULL);
- UpdateProviderPolicy(policy);
-
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderSearchURL, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderName, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderKeyword, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderSuggestURL, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderIconURL, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderEncodings, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderAlternateURLs,
- NULL));
- EXPECT_FALSE(store_->GetValue(
- prefs::kDefaultSearchProviderSearchTermsReplacementKey, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderImageURL, NULL));
- EXPECT_FALSE(store_->GetValue(
- prefs::kDefaultSearchProviderImageURLPostParams, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderInstantURL, NULL));
- EXPECT_FALSE(store_->GetValue(prefs::kDefaultSearchProviderNewTabURL, NULL));
-}
-
-// Checks that if the default search policy is invalid, that no elements of the
-// default search policy will be present.
-TEST_F(DefaultSearchPolicyHandlerTest, Disabled) {
- PolicyMap policy;
- policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false), NULL);
- UpdateProviderPolicy(policy);
-
- const base::Value* value = NULL;
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderEnabled, &value));
- base::FundamentalValue expected_enabled(false);
- EXPECT_TRUE(base::Value::Equals(&expected_enabled, value));
- EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderSearchURL, &value));
- base::StringValue expected_search_url((std::string()));
- EXPECT_TRUE(base::Value::Equals(&expected_search_url, value));
+ dictionary->GetList(DefaultSearchManager::kInputEncodings, &list_value));
+ EXPECT_TRUE(base::ListValue().Equals(list_value));
+ EXPECT_TRUE(
+ dictionary->GetList(DefaultSearchManager::kAlternateURLs, &list_value));
+ EXPECT_TRUE(base::ListValue().Equals(list_value));
+ EXPECT_TRUE(dictionary->GetString(
+ DefaultSearchManager::kSearchTermsReplacementKey, &value));
+ EXPECT_EQ(std::string(), value);
+ EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kImageURL, &value));
+ EXPECT_EQ(std::string(), value);
+ EXPECT_TRUE(
+ dictionary->GetString(DefaultSearchManager::kImageURLPostParams, &value));
+ EXPECT_EQ(std::string(), value);
+ EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kSearchURLPostParams,
+ &value));
+ EXPECT_EQ(std::string(), value);
+ EXPECT_TRUE(dictionary->GetString(
+ DefaultSearchManager::kSuggestionsURLPostParams, &value));
+ EXPECT_EQ(std::string(), value);
+ EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kInstantURLPostParams,
+ &value));
+ EXPECT_EQ(std::string(), value);
}
// Checks that for a fully defined search policy, all elements have been
// read properly into the dictionary pref.
-TEST_F(DefaultSearchPolicyHandlerTest, DictionaryPref) {
+TEST_F(DefaultSearchPolicyHandlerTest,FullyDefined) {
PolicyMap policy;
BuildDefaultSearchPolicy(&policy);
UpdateProviderPolicy(policy);
@@ -373,91 +236,55 @@ TEST_F(DefaultSearchPolicyHandlerTest, DictionaryPref) {
EXPECT_EQ(std::string(), value);
}
-// Checks that disabling default search is properly reflected the dictionary
-// pref.
-TEST_F(DefaultSearchPolicyHandlerTest, DictionaryPrefDSEDisabled) {
+// Checks that if the default search policy is missing, that no elements of the
+// default search policy will be present.
+TEST_F(DefaultSearchPolicyHandlerTest, MissingUrl) {
PolicyMap policy;
- policy.Set(key::kDefaultSearchProviderEnabled,
- POLICY_LEVEL_MANDATORY,
+ BuildDefaultSearchPolicy(&policy);
+ policy.Erase(key::kDefaultSearchProviderSearchURL);
+ UpdateProviderPolicy(policy);
+
+ const base::Value* temp = NULL;
+ EXPECT_FALSE(store_->GetValue(kDefaultSearchProviderData, &temp));
+}
+
+// Checks that if the default search policy is invalid, that no elements of the
+// default search policy will be present.
+TEST_F(DefaultSearchPolicyHandlerTest, Invalid) {
+ PolicyMap policy;
+ BuildDefaultSearchPolicy(&policy);
+ const char bad_search_url[] = "http://test.com/noSearchTerms";
+ policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
- base::Value::CreateBooleanValue(false),
- NULL);
+ base::Value::CreateStringValue(bad_search_url), NULL);
UpdateProviderPolicy(policy);
+
const base::Value* temp = NULL;
- const base::DictionaryValue* dictionary;
- EXPECT_TRUE(store_->GetValue(kDefaultSearchProviderData, &temp));
- temp->GetAsDictionary(&dictionary);
- bool disabled = false;
- EXPECT_TRUE(dictionary->GetBoolean(DefaultSearchManager::kDisabledByPolicy,
- &disabled));
- EXPECT_TRUE(disabled);
+ EXPECT_FALSE(store_->GetValue(kDefaultSearchProviderData, &temp));
}
-// Checks that if the policy for default search is valid, i.e. there's a
-// search URL, that all the elements have been given proper defaults.
-TEST_F(DefaultSearchPolicyHandlerTest, DictionaryPrefMinimallyDefined) {
+// Checks that disabling default search is properly reflected in the pref.
+TEST_F(DefaultSearchPolicyHandlerTest, Disabled) {
PolicyMap policy;
policy.Set(key::kDefaultSearchProviderEnabled,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
- base::Value::CreateBooleanValue(true),
- NULL);
- policy.Set(key::kDefaultSearchProviderSearchURL,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- base::Value::CreateStringValue(kSearchURL),
+ base::Value::CreateBooleanValue(false),
NULL);
UpdateProviderPolicy(policy);
-
const base::Value* temp = NULL;
const base::DictionaryValue* dictionary;
- std::string value;
- const base::ListValue* list_value;
EXPECT_TRUE(store_->GetValue(kDefaultSearchProviderData, &temp));
temp->GetAsDictionary(&dictionary);
-
- // Name and keyword should be derived from host.
- EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kURL, &value));
- EXPECT_EQ(kSearchURL, value);
- EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kShortName, &value));
- EXPECT_EQ(kHostName, value);
- EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kKeyword, &value));
- EXPECT_EQ(kHostName, value);
-
- // Everything else should be set to the default value.
- EXPECT_TRUE(
- dictionary->GetString(DefaultSearchManager::kSuggestionsURL, &value));
- EXPECT_EQ(std::string(), value);
- EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kFaviconURL, &value));
- EXPECT_EQ(std::string(), value);
- EXPECT_TRUE(
- dictionary->GetList(DefaultSearchManager::kInputEncodings, &list_value));
- EXPECT_TRUE(base::ListValue().Equals(list_value));
- EXPECT_TRUE(
- dictionary->GetList(DefaultSearchManager::kAlternateURLs, &list_value));
- EXPECT_TRUE(base::ListValue().Equals(list_value));
- EXPECT_TRUE(dictionary->GetString(
- DefaultSearchManager::kSearchTermsReplacementKey, &value));
- EXPECT_EQ(std::string(), value);
- EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kImageURL, &value));
- EXPECT_EQ(std::string(), value);
- EXPECT_TRUE(
- dictionary->GetString(DefaultSearchManager::kImageURLPostParams, &value));
- EXPECT_EQ(std::string(), value);
- EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kSearchURLPostParams,
- &value));
- EXPECT_EQ(std::string(), value);
- EXPECT_TRUE(dictionary->GetString(
- DefaultSearchManager::kSuggestionsURLPostParams, &value));
- EXPECT_EQ(std::string(), value);
- EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kInstantURLPostParams,
- &value));
- EXPECT_EQ(std::string(), value);
+ bool disabled = false;
+ EXPECT_TRUE(dictionary->GetBoolean(DefaultSearchManager::kDisabledByPolicy,
+ &disabled));
+ EXPECT_TRUE(disabled);
}
// Checks that setting a file URL as the default search is reflected properly in
-// the dictionary pref.
-TEST_F(DefaultSearchPolicyHandlerTest, DictionaryPrefFileURL) {
+// the pref.
+TEST_F(DefaultSearchPolicyHandlerTest, FileURL) {
PolicyMap policy;
policy.Set(key::kDefaultSearchProviderEnabled,
POLICY_LEVEL_MANDATORY,
« chrome/browser/search_engines/default_search_manager.cc ('K') | « chrome/browser/search_engines/default_search_policy_handler.cc ('k') | chrome/browser/search_engines/default_search_pref_migration.cc » ('j') | chrome/browser/search_engines/default_search_pref_migration.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698