Remove SetWithoutPathExpansion

components/sync_preferences/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 "components/sync_preferences/pref_model_associator.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 47 matching lines @@
     pref_registry->RegisterDictionaryPref(
         kDictionaryPrefName, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
     pref_service_ = factory.CreateSyncable(pref_registry.get());
     pref_sync_service_ = static_cast<PrefModelAssociator*>(
         pref_service_->GetSyncableService(syncer::PREFERENCES));
   }
 
   void SetContentPattern(base::DictionaryValue* patterns_dict,
                          const std::string& expression,
                          int setting) {
-    base::DictionaryValue* expression_dict;
+    base::DictionaryValue* expression_dict = nullptr;
     bool found = patterns_dict->GetDictionaryWithoutPathExpansion(
         expression, &expression_dict);
     if (!found) {
-      expression_dict = new base::DictionaryValue;
-      patterns_dict->SetWithoutPathExpansion(expression, expression_dict);
+      patterns_dict->SetWithoutPathExpansion(
+          expression, base::MakeUnique<base::DictionaryValue>());
+      patterns_dict->GetDictionaryWithoutPathExpansion(expression,
+                                                       &expression_dict);
     }
-    expression_dict->SetWithoutPathExpansion("setting",
-                                             new base::Value(setting));
+    expression_dict->SetIntegerWithoutPathExpansion("setting", setting);
   }
 
   void SetPrefToEmpty(const std::string& pref_name) {
     std::unique_ptr<base::Value> empty_value;
     const PrefService::Preference* pref =
         pref_service_->FindPreference(pref_name.c_str());
     ASSERT_TRUE(pref);
     base::Value::Type type = pref->GetType();
     if (type == base::Value::Type::DICTIONARY)
       empty_value.reset(new base::DictionaryValue);
@@ skipping 345 matching lines @@
   base::DictionaryValue server_patterns_;
 };
 
 TEST_F(IndividualPreferenceMergeTest, ListPreference) {
   EXPECT_TRUE(MergeListPreference(kListPrefName));
 }
 
 }  // namespace
 
 }  // namespace sync_preferences