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

Unified Diff: components/sync_preferences/pref_model_associator_unittest.cc

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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
Index: components/sync_preferences/pref_model_associator_unittest.cc
diff --git a/components/sync_preferences/pref_model_associator_unittest.cc b/components/sync_preferences/pref_model_associator_unittest.cc
index eac90d7f527e5196e7cf35f7f1244dfa823a3967..f189891710f0f9a3c0b4e0239960ff660124fb48 100644
--- a/components/sync_preferences/pref_model_associator_unittest.cc
+++ b/components/sync_preferences/pref_model_associator_unittest.cc
@@ -117,8 +117,7 @@ TEST_F(ListPreferenceMergeTest, NotListOrDictionary) {
pref_service_->SetString(kStringPrefName, local_url0_);
const PrefService::Preference* pref =
pref_service_->FindPreference(kStringPrefName);
- std::unique_ptr<base::Value> server_value(
- new base::StringValue(server_url0_));
+ std::unique_ptr<base::Value> server_value(new base::Value(server_url0_));
std::unique_ptr<base::Value> merged_value(pref_sync_service_->MergePreference(
pref->name(), *pref->GetValue(), *server_value));
EXPECT_TRUE(merged_value->Equals(server_value.get()));

Powered by Google App Engine
This is Rietveld 408576698