Get rid of the rest of CreateStringValue

chrome/browser/prefs/pref_model_associator_unittest.cc

 // Copyright (c) 2011 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 "base/prefs/scoped_user_pref_update.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 44 matching lines @@
 class ListPreferenceMergeTest : public AbstractPreferenceMergeTest {
  protected:
   ListPreferenceMergeTest() :
       server_url0_("http://example.com/server0"),
       server_url1_("http://example.com/server1"),
       local_url0_("http://example.com/local0"),
       local_url1_("http://example.com/local1") {}
 
   virtual void SetUp() {
     AbstractPreferenceMergeTest::SetUp();
-    server_url_list_.Append(base::Value::CreateStringValue(server_url0_));
-    server_url_list_.Append(base::Value::CreateStringValue(server_url1_));
+    server_url_list_.Append(new base::StringValue(server_url0_));
+    server_url_list_.Append(new base::StringValue(server_url1_));
   }
 
   std::string server_url0_;
   std::string server_url1_;
   std::string local_url0_;
   std::string local_url1_;
   base::ListValue server_url_list_;
 };
 
 TEST_F(ListPreferenceMergeTest, NotListOrDictionary) {
   pref_service_->SetString(prefs::kHomePage, local_url0_);
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kHomePage);
-  scoped_ptr<base::Value> server_value(
-      base::Value::CreateStringValue(server_url0_));
+  scoped_ptr<base::Value> server_value(new base::StringValue(server_url0_));
   scoped_ptr<base::Value> merged_value(
       PrefModelAssociator::MergePreference(pref->name(),
                                            *pref->GetValue(),
                                            *server_value));
   EXPECT_TRUE(merged_value->Equals(server_value.get()));
 }
 
 TEST_F(ListPreferenceMergeTest, LocalEmpty) {
   SetPrefToEmpty(prefs::kURLsToRestoreOnStartup);
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
   scoped_ptr<base::Value> merged_value(
       PrefModelAssociator::MergePreference(pref->name(),
                                            *pref->GetValue(),
                                            server_url_list_));
   EXPECT_TRUE(merged_value->Equals(&server_url_list_));
 }
 
 TEST_F(ListPreferenceMergeTest, ServerNull) {
   scoped_ptr<base::Value> null_value(base::Value::CreateNullValue());
   {
     ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup);
     base::ListValue* local_list_value = update.Get();
-    local_list_value->Append(base::Value::CreateStringValue(local_url0_));
+    local_list_value->Append(new base::StringValue(local_url0_));
   }
 
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
   scoped_ptr<base::Value> merged_value(
       PrefModelAssociator::MergePreference(pref->name(),
                                            *pref->GetValue(),
                                            *null_value));
   const base::ListValue* local_list_value =
         pref_service_->GetList(prefs::kURLsToRestoreOnStartup);
   EXPECT_TRUE(merged_value->Equals(local_list_value));
 }
 
 TEST_F(ListPreferenceMergeTest, ServerEmpty) {
   scoped_ptr<base::Value> empty_value(new base::ListValue);
   {
     ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup);
     base::ListValue* local_list_value = update.Get();
-    local_list_value->Append(base::Value::CreateStringValue(local_url0_));
+    local_list_value->Append(new base::StringValue(local_url0_));
   }
 
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
   scoped_ptr<base::Value> merged_value(
       PrefModelAssociator::MergePreference(pref->name(),
                                            *pref->GetValue(),
                                            *empty_value));
   const base::ListValue* local_list_value =
         pref_service_->GetList(prefs::kURLsToRestoreOnStartup);
   EXPECT_TRUE(merged_value->Equals(local_list_value));
 }
 
 TEST_F(ListPreferenceMergeTest, Merge) {
   {
     ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup);
     base::ListValue* local_list_value = update.Get();
-    local_list_value->Append(base::Value::CreateStringValue(local_url0_));
-    local_list_value->Append(base::Value::CreateStringValue(local_url1_));
+    local_list_value->Append(new base::StringValue(local_url0_));
+    local_list_value->Append(new base::StringValue(local_url1_));
   }
 
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
   scoped_ptr<base::Value> merged_value(
       PrefModelAssociator::MergePreference(pref->name(),
                                            *pref->GetValue(),
                                            server_url_list_));
 
   base::ListValue expected;
-  expected.Append(base::Value::CreateStringValue(server_url0_));
-  expected.Append(base::Value::CreateStringValue(server_url1_));
-  expected.Append(base::Value::CreateStringValue(local_url0_));
-  expected.Append(base::Value::CreateStringValue(local_url1_));
+  expected.Append(new base::StringValue(server_url0_));
+  expected.Append(new base::StringValue(server_url1_));
+  expected.Append(new base::StringValue(local_url0_));
+  expected.Append(new base::StringValue(local_url1_));
   EXPECT_TRUE(merged_value->Equals(&expected));
 }
 
 TEST_F(ListPreferenceMergeTest, Duplicates) {
   {
     ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup);
     base::ListValue* local_list_value = update.Get();
-    local_list_value->Append(base::Value::CreateStringValue(local_url0_));
-    local_list_value->Append(base::Value::CreateStringValue(server_url0_));
-    local_list_value->Append(base::Value::CreateStringValue(server_url1_));
+    local_list_value->Append(new base::StringValue(local_url0_));
+    local_list_value->Append(new base::StringValue(server_url0_));
+    local_list_value->Append(new base::StringValue(server_url1_));
   }
 
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
   scoped_ptr<base::Value> merged_value(
       PrefModelAssociator::MergePreference(pref->name(),
                                            *pref->GetValue(),
                                            server_url_list_));
 
   base::ListValue expected;
-  expected.Append(base::Value::CreateStringValue(server_url0_));
-  expected.Append(base::Value::CreateStringValue(server_url1_));
-  expected.Append(base::Value::CreateStringValue(local_url0_));
+  expected.Append(new base::StringValue(server_url0_));
+  expected.Append(new base::StringValue(server_url1_));
+  expected.Append(new base::StringValue(local_url0_));
   EXPECT_TRUE(merged_value->Equals(&expected));
 }
 
 TEST_F(ListPreferenceMergeTest, Equals) {
   {
     ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup);
     base::ListValue* local_list_value = update.Get();
-    local_list_value->Append(base::Value::CreateStringValue(server_url0_));
-    local_list_value->Append(base::Value::CreateStringValue(server_url1_));
+    local_list_value->Append(new base::StringValue(server_url0_));
+    local_list_value->Append(new base::StringValue(server_url1_));
   }
 
   scoped_ptr<base::Value> original(server_url_list_.DeepCopy());
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
   scoped_ptr<base::Value> merged_value(
       PrefModelAssociator::MergePreference(pref->name(),
                                            *pref->GetValue(),
                                            server_url_list_));
   EXPECT_TRUE(merged_value->Equals(original.get()));
@@ skipping 162 matching lines @@
  protected:
   IndividualPreferenceMergeTest() :
       url0_("http://example.com/server0"),
       url1_("http://example.com/server1"),
       expression0_("expression0"),
       expression1_("expression1"),
       content_type0_("content_type0") {}
 
   virtual void SetUp() {
     AbstractPreferenceMergeTest::SetUp();
-    server_url_list_.Append(base::Value::CreateStringValue(url0_));
+    server_url_list_.Append(new base::StringValue(url0_));
     SetContentPattern(&server_patterns_, expression0_, content_type0_, 1);
   }
 
   bool MergeListPreference(const char* pref) {
     {
       ListPrefUpdate update(pref_service_, pref);
       base::ListValue* local_list_value = update.Get();
-      local_list_value->Append(base::Value::CreateStringValue(url1_));
+      local_list_value->Append(new base::StringValue(url1_));
     }
 
     scoped_ptr<base::Value> merged_value(PrefModelAssociator::MergePreference(
         pref,
         *pref_service_->GetUserPrefValue(pref),
         server_url_list_));
 
     base::ListValue expected;
-    expected.Append(base::Value::CreateStringValue(url0_));
-    expected.Append(base::Value::CreateStringValue(url1_));
+    expected.Append(new base::StringValue(url0_));
+    expected.Append(new base::StringValue(url1_));
     return merged_value->Equals(&expected);
   }
 
   bool MergeDictionaryPreference(const char* pref) {
     {
       DictionaryPrefUpdate update(pref_service_, pref);
       base::DictionaryValue* local_dict_value = update.Get();
       SetContentPattern(local_dict_value, expression1_, content_type0_, 1);
     }
 
@@ skipping 13 matching lines @@
   std::string expression0_;
   std::string expression1_;
   std::string content_type0_;
   base::ListValue server_url_list_;
   base::DictionaryValue server_patterns_;
 };
 
 TEST_F(IndividualPreferenceMergeTest, URLsToRestoreOnStartup) {
   EXPECT_TRUE(MergeListPreference(prefs::kURLsToRestoreOnStartup));
 }