Get rid of the rest of CreateStringValue

components/search_engines/default_search_policy_handler_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
 #include "components/policy/core/browser/configuration_policy_pref_store.h"
 #include "components/policy/core/browser/configuration_policy_pref_store_test.h"
 #include "components/search_engines/default_search_manager.h"
 #include "components/search_engines/default_search_policy_handler.h"
 #include "components/search_engines/search_engines_pref_names.h"
@@ skipping 69 matching lines @@
 void DefaultSearchPolicyHandlerTest::
     BuildDefaultSearchPolicy(PolicyMap* policy) {
   base::ListValue* encodings = new base::ListValue();
   encodings->AppendString("UTF-16");
   encodings->AppendString("UTF-8");
   policy->Set(key::kDefaultSearchProviderEnabled,
               POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER,
               new base::FundamentalValue(true),
               NULL);
-  policy->Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, base::Value::CreateStringValue(kSearchURL),
+  policy->Set(key::kDefaultSearchProviderSearchURL,
+              POLICY_LEVEL_MANDATORY,
+              POLICY_SCOPE_USER,
+              new base::StringValue(kSearchURL),
               NULL);
-  policy->Set(key::kDefaultSearchProviderName, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, base::Value::CreateStringValue(kName), NULL);
-  policy->Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, base::Value::CreateStringValue(kKeyword),
+  policy->Set(key::kDefaultSearchProviderName,
+              POLICY_LEVEL_MANDATORY,
+              POLICY_SCOPE_USER,
+              new base::StringValue(kName),
               NULL);
-  policy->Set(key::kDefaultSearchProviderSuggestURL, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, base::Value::CreateStringValue(kSuggestURL),
+  policy->Set(key::kDefaultSearchProviderKeyword,
+              POLICY_LEVEL_MANDATORY,
+              POLICY_SCOPE_USER,
+              new base::StringValue(kKeyword),
               NULL);
-  policy->Set(key::kDefaultSearchProviderIconURL, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, base::Value::CreateStringValue(kIconURL),
+  policy->Set(key::kDefaultSearchProviderSuggestURL,
+              POLICY_LEVEL_MANDATORY,
+              POLICY_SCOPE_USER,
+              new base::StringValue(kSuggestURL),
+              NULL);
+  policy->Set(key::kDefaultSearchProviderIconURL,
+              POLICY_LEVEL_MANDATORY,
+              POLICY_SCOPE_USER,
+              new base::StringValue(kIconURL),
               NULL);
   policy->Set(key::kDefaultSearchProviderEncodings, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, encodings, NULL);
   policy->Set(key::kDefaultSearchProviderAlternateURLs, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, default_alternate_urls_.DeepCopy(), NULL);
   policy->Set(key::kDefaultSearchProviderSearchTermsReplacementKey,
-              POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-              base::Value::CreateStringValue(kReplacementKey), NULL);
+              POLICY_LEVEL_MANDATORY,
+              POLICY_SCOPE_USER,
+              new base::StringValue(kReplacementKey),
+              NULL);
   policy->Set(key::kDefaultSearchProviderImageURL,
-              POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-              base::Value::CreateStringValue(kImageURL), NULL);
+              POLICY_LEVEL_MANDATORY,
+              POLICY_SCOPE_USER,
+              new base::StringValue(kImageURL),
+              NULL);
   policy->Set(key::kDefaultSearchProviderImageURLPostParams,
-              POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-              base::Value::CreateStringValue(kImageParams), NULL);
+              POLICY_LEVEL_MANDATORY,
+              POLICY_SCOPE_USER,
+              new base::StringValue(kImageParams),
+              NULL);
   policy->Set(key::kDefaultSearchProviderNewTabURL,
-              POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-              base::Value::CreateStringValue(kNewTabURL), NULL);
+              POLICY_LEVEL_MANDATORY,
+              POLICY_SCOPE_USER,
+              new base::StringValue(kNewTabURL),
+              NULL);
 }
 
 // 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, MinimallyDefined) {
   PolicyMap policy;
   policy.Set(key::kDefaultSearchProviderEnabled,
              POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER,
              new base::FundamentalValue(true),
              NULL);
-  policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER, base::Value::CreateStringValue(kSearchURL),
+  policy.Set(key::kDefaultSearchProviderSearchURL,
+             POLICY_LEVEL_MANDATORY,
+             POLICY_SCOPE_USER,
+             new base::StringValue(kSearchURL),
              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));
 
@@ skipping 127 matching lines @@
   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.Set(key::kDefaultSearchProviderSearchURL,
+             POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER,
-             base::Value::CreateStringValue(bad_search_url), NULL);
+             new base::StringValue(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));
@@ skipping 114 matching lines @@
 TEST_F(DefaultSearchPolicyHandlerTest, DictionaryPrefMinimallyDefined) {
   PolicyMap policy;
   policy.Set(key::kDefaultSearchProviderEnabled,
              POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER,
              new base::FundamentalValue(true),
              NULL);
   policy.Set(key::kDefaultSearchProviderSearchURL,
              POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER,
-             base::Value::CreateStringValue(kSearchURL),
+             new base::StringValue(kSearchURL),
              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);
 
@@ skipping 41 matching lines @@
 TEST_F(DefaultSearchPolicyHandlerTest, DictionaryPrefFileURL) {
   PolicyMap policy;
   policy.Set(key::kDefaultSearchProviderEnabled,
              POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER,
              new base::FundamentalValue(true),
              NULL);
   policy.Set(key::kDefaultSearchProviderSearchURL,
              POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER,
-             base::Value::CreateStringValue(kFileSearchURL),
+             new base::StringValue(kFileSearchURL),
              NULL);
   UpdateProviderPolicy(policy);
 
   const base::Value* temp = NULL;
   const base::DictionaryValue* dictionary;
   std::string value;
 
   EXPECT_TRUE(store_->GetValue(kDefaultSearchProviderData, &temp));
   temp->GetAsDictionary(&dictionary);
 
   EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kURL, &value));
   EXPECT_EQ(kFileSearchURL, value);
   EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kShortName, &value));
   EXPECT_EQ("_", value);
   EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kKeyword, &value));
   EXPECT_EQ("_", value);
 }
 }  // namespace policy