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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/search_engines/default_search_policy_handler_unittest.cc

Issue 1940153002: Use std::unique_ptr to express ownership of base::Value in PolicyMap::Entry (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More fixes (partial Windows fix) Created 4 years, 8 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
« components/policy/core/common/policy_loader_win.cc ('K') | « components/policy/tools/generate_policy_source.py ('k') | components/sync_driver/sync_policy_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/search_engines/default_search_policy_handler_unittest.cc
diff --git a/components/search_engines/default_search_policy_handler_unittest.cc b/components/search_engines/default_search_policy_handler_unittest.cc
index 6668a945639da2d4563e868ffb99d0be05dab12e..6cdbf02f86cab4bb84344cd9136eec0ee5a1a2e4 100644
--- a/components/search_engines/default_search_policy_handler_unittest.cc
+++ b/components/search_engines/default_search_policy_handler_unittest.cc
@@ -86,71 +86,43 @@ void DefaultSearchPolicyHandlerTest::
base::ListValue* encodings = new base::ListValue();
encodings->AppendString("UTF-16");
encodings->AppendString("UTF-8");
- policy->Set(key::kDefaultSearchProviderEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
- policy->Set(key::kDefaultSearchProviderSearchURL,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kSearchURL),
- NULL);
- policy->Set(key::kDefaultSearchProviderName,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kName),
- NULL);
- policy->Set(key::kDefaultSearchProviderKeyword,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kKeyword),
- NULL);
- policy->Set(key::kDefaultSearchProviderSuggestURL,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kSuggestURL),
- NULL);
- policy->Set(key::kDefaultSearchProviderIconURL,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kIconURL),
- NULL);
+ policy->Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ policy->Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kSearchURL)), nullptr);
+ policy->Set(key::kDefaultSearchProviderName, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kName)), nullptr);
+ policy->Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kKeyword)), nullptr);
+ policy->Set(key::kDefaultSearchProviderSuggestURL, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kSuggestURL)), nullptr);
+ policy->Set(key::kDefaultSearchProviderIconURL, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kIconURL)), nullptr);
policy->Set(key::kDefaultSearchProviderEncodings, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, encodings, nullptr);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(encodings), nullptr);
policy->Set(key::kDefaultSearchProviderAlternateURLs, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- default_alternate_urls_.DeepCopy(), nullptr);
+ default_alternate_urls_.CreateDeepCopy(), nullptr);
policy->Set(key::kDefaultSearchProviderSearchTermsReplacementKey,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kReplacementKey),
- NULL);
- policy->Set(key::kDefaultSearchProviderImageURL,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kImageURL),
- NULL);
+ POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kReplacementKey)),
+ nullptr);
+ policy->Set(key::kDefaultSearchProviderImageURL, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kImageURL)), nullptr);
policy->Set(key::kDefaultSearchProviderImageURLPostParams,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kImageParams),
- NULL);
- policy->Set(key::kDefaultSearchProviderNewTabURL,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kNewTabURL),
- NULL);
+ POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kImageParams)), nullptr);
+ policy->Set(key::kDefaultSearchProviderNewTabURL, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kNewTabURL)), nullptr);
}
// Checks that if the default search policy is missing, that no elements of the
@@ -173,7 +145,7 @@ TEST_F(DefaultSearchPolicyHandlerTest, Invalid) {
const char bad_search_url[] = "http://test.com/noSearchTerms";
policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- new base::StringValue(bad_search_url), nullptr);
+ base::WrapUnique(new base::StringValue(bad_search_url)), nullptr);
UpdateProviderPolicy(policy);
const base::Value* temp = nullptr;
@@ -247,12 +219,9 @@ TEST_F(DefaultSearchPolicyHandlerTest, FullyDefined) {
// pref.
TEST_F(DefaultSearchPolicyHandlerTest, Disabled) {
PolicyMap policy;
- policy.Set(key::kDefaultSearchProviderEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policy);
const base::Value* temp = NULL;
const base::DictionaryValue* dictionary;
@@ -268,18 +237,12 @@ TEST_F(DefaultSearchPolicyHandlerTest, Disabled) {
// search URL, that all the elements have been given proper defaults.
TEST_F(DefaultSearchPolicyHandlerTest, MinimallyDefined) {
PolicyMap policy;
- policy.Set(key::kDefaultSearchProviderEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
- policy.Set(key::kDefaultSearchProviderSearchURL,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kSearchURL),
- NULL);
+ policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kSearchURL)), nullptr);
UpdateProviderPolicy(policy);
const base::Value* temp = NULL;
@@ -332,18 +295,12 @@ TEST_F(DefaultSearchPolicyHandlerTest, MinimallyDefined) {
// the dictionary pref.
TEST_F(DefaultSearchPolicyHandlerTest, FileURL) {
PolicyMap policy;
- policy.Set(key::kDefaultSearchProviderEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
- policy.Set(key::kDefaultSearchProviderSearchURL,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kFileSearchURL),
- NULL);
+ policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kFileSearchURL)), nullptr);
UpdateProviderPolicy(policy);
const base::Value* temp = NULL;
« components/policy/core/common/policy_loader_win.cc ('K') | « components/policy/tools/generate_policy_source.py ('k') | components/sync_driver/sync_policy_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698