| Index: components/syncable_prefs/pref_model_associator_unittest.cc
|
| diff --git a/components/syncable_prefs/pref_model_associator_unittest.cc b/components/syncable_prefs/pref_model_associator_unittest.cc
|
| index 8670130d684d08143681fbccd0f00d6b55d3ae31..023524208a8387b493f4b53e5fadbd9c7f9a69f1 100644
|
| --- a/components/syncable_prefs/pref_model_associator_unittest.cc
|
| +++ b/components/syncable_prefs/pref_model_associator_unittest.cc
|
| @@ -106,8 +106,8 @@ class ListPreferenceMergeTest : public AbstractPreferenceMergeTest {
|
| server_url1_("http://example.com/server1"),
|
| local_url0_("http://example.com/local0"),
|
| local_url1_("http://example.com/local1") {
|
| - server_url_list_.Append(new base::StringValue(server_url0_));
|
| - server_url_list_.Append(new base::StringValue(server_url1_));
|
| + server_url_list_.AppendString(server_url0_);
|
| + server_url_list_.AppendString(server_url1_);
|
| }
|
|
|
| std::string server_url0_;
|
| @@ -142,7 +142,7 @@ TEST_F(ListPreferenceMergeTest, ServerNull) {
|
| {
|
| ListPrefUpdate update(pref_service_.get(), kListPrefName);
|
| base::ListValue* local_list_value = update.Get();
|
| - local_list_value->Append(new base::StringValue(local_url0_));
|
| + local_list_value->AppendString(local_url0_);
|
| }
|
|
|
| const PrefService::Preference* pref =
|
| @@ -159,7 +159,7 @@ TEST_F(ListPreferenceMergeTest, ServerEmpty) {
|
| {
|
| ListPrefUpdate update(pref_service_.get(), kListPrefName);
|
| base::ListValue* local_list_value = update.Get();
|
| - local_list_value->Append(new base::StringValue(local_url0_));
|
| + local_list_value->AppendString(local_url0_);
|
| }
|
|
|
| const PrefService::Preference* pref =
|
| @@ -175,8 +175,8 @@ TEST_F(ListPreferenceMergeTest, Merge) {
|
| {
|
| ListPrefUpdate update(pref_service_.get(), kListPrefName);
|
| base::ListValue* local_list_value = update.Get();
|
| - local_list_value->Append(new base::StringValue(local_url0_));
|
| - local_list_value->Append(new base::StringValue(local_url1_));
|
| + local_list_value->AppendString(local_url0_);
|
| + local_list_value->AppendString(local_url1_);
|
| }
|
|
|
| const PrefService::Preference* pref =
|
| @@ -185,10 +185,10 @@ TEST_F(ListPreferenceMergeTest, Merge) {
|
| pref->name(), *pref->GetValue(), server_url_list_));
|
|
|
| base::ListValue expected;
|
| - 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_));
|
| + expected.AppendString(server_url0_);
|
| + expected.AppendString(server_url1_);
|
| + expected.AppendString(local_url0_);
|
| + expected.AppendString(local_url1_);
|
| EXPECT_TRUE(merged_value->Equals(&expected));
|
| }
|
|
|
| @@ -196,9 +196,9 @@ TEST_F(ListPreferenceMergeTest, Duplicates) {
|
| {
|
| ListPrefUpdate update(pref_service_.get(), kListPrefName);
|
| base::ListValue* local_list_value = update.Get();
|
| - 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_));
|
| + local_list_value->AppendString(local_url0_);
|
| + local_list_value->AppendString(server_url0_);
|
| + local_list_value->AppendString(server_url1_);
|
| }
|
|
|
| const PrefService::Preference* pref =
|
| @@ -207,9 +207,9 @@ TEST_F(ListPreferenceMergeTest, Duplicates) {
|
| pref->name(), *pref->GetValue(), server_url_list_));
|
|
|
| base::ListValue expected;
|
| - expected.Append(new base::StringValue(server_url0_));
|
| - expected.Append(new base::StringValue(server_url1_));
|
| - expected.Append(new base::StringValue(local_url0_));
|
| + expected.AppendString(server_url0_);
|
| + expected.AppendString(server_url1_);
|
| + expected.AppendString(local_url0_);
|
| EXPECT_TRUE(merged_value->Equals(&expected));
|
| }
|
|
|
| @@ -217,8 +217,8 @@ TEST_F(ListPreferenceMergeTest, Equals) {
|
| {
|
| ListPrefUpdate update(pref_service_.get(), kListPrefName);
|
| base::ListValue* local_list_value = update.Get();
|
| - local_list_value->Append(new base::StringValue(server_url0_));
|
| - local_list_value->Append(new base::StringValue(server_url1_));
|
| + local_list_value->AppendString(server_url0_);
|
| + local_list_value->AppendString(server_url1_);
|
| }
|
|
|
| std::unique_ptr<base::Value> original(server_url_list_.DeepCopy());
|
| @@ -389,7 +389,7 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest {
|
| url1_("http://example.com/server1"),
|
| expression0_("expression0"),
|
| expression1_("expression1") {
|
| - server_url_list_.Append(new base::StringValue(url0_));
|
| + server_url_list_.AppendString(url0_);
|
| SetContentPattern(&server_patterns_, expression0_, 1);
|
| }
|
|
|
| @@ -397,7 +397,7 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest {
|
| {
|
| ListPrefUpdate update(pref_service_.get(), pref);
|
| base::ListValue* local_list_value = update.Get();
|
| - local_list_value->Append(new base::StringValue(url1_));
|
| + local_list_value->AppendString(url1_);
|
| }
|
|
|
| std::unique_ptr<base::Value> merged_value(
|
| @@ -405,8 +405,8 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest {
|
| pref, *pref_service_->GetUserPrefValue(pref), server_url_list_));
|
|
|
| base::ListValue expected;
|
| - expected.Append(new base::StringValue(url0_));
|
| - expected.Append(new base::StringValue(url1_));
|
| + expected.AppendString(url0_);
|
| + expected.AppendString(url1_);
|
| return merged_value->Equals(&expected);
|
| }
|
|
|
|
|