Remove SetWithoutPathExpansion

chromeos/dbus/fake_shill_profile_client.cc

 // Copyright 2013 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 "chromeos/dbus/fake_shill_profile_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
@@ skipping 46 matching lines @@
 void FakeShillProfileClient::GetProperties(
     const dbus::ObjectPath& profile_path,
     const DictionaryValueCallbackWithoutStatus& callback,
     const ErrorCallback& error_callback) {
   ProfileProperties* profile = GetProfile(profile_path, error_callback);
   if (!profile)
     return;
 
   std::unique_ptr<base::DictionaryValue> properties(
       profile->properties.DeepCopy());
-  base::ListValue* entry_paths = new base::ListValue;
-  properties->SetWithoutPathExpansion(shill::kEntriesProperty, entry_paths);
+  base::ListValue* entry_paths = nullptr;
+  properties->SetWithoutPathExpansion(shill::kEntriesProperty,
+                                      base::MakeUnique<base::ListValue>());
+  properties->GetListWithoutPathExpansion(shill::kEntriesProperty,
+                                          &entry_paths);
   for (base::DictionaryValue::Iterator it(profile->entries); !it.IsAtEnd();
        it.Advance()) {
     entry_paths->AppendString(it.key());
   }
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&PassDictionary, callback, base::Owned(properties.release())));
 }
 
@@ skipping 63 matching lines @@
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
       AddProfile(profile_path);
 }
 
 void FakeShillProfileClient::AddEntry(const std::string& profile_path,
                                       const std::string& entry_path,
                                       const base::DictionaryValue& properties) {
   ProfileProperties* profile = GetProfile(dbus::ObjectPath(profile_path),
                                           ErrorCallback());
   DCHECK(profile);
-  profile->entries.SetWithoutPathExpansion(entry_path, properties.DeepCopy());
+  profile->entries.SetWithoutPathExpansion(entry_path,
+                                           properties.CreateDeepCopy());
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
       AddManagerService(entry_path, true);
 }
 
 bool FakeShillProfileClient::AddService(const std::string& profile_path,
                                         const std::string& service_path) {
   ProfileProperties* profile = GetProfile(dbus::ObjectPath(profile_path),
                                           ErrorCallback());
   if (!profile) {
     LOG(ERROR) << "AddService: No matching profile: " << profile_path
@@ skipping 41 matching lines @@
     base::Value profile_path_value(profile_path);
     service_test->SetServiceProperty(service_path,
                                      shill::kProfileProperty,
                                      profile_path_value);
   } else if (service_profile_path != profile_path) {
     LOG(ERROR) << "Service has non matching profile path: "
                << service_profile_path;
     return false;
   }
 
-  profile->entries.SetWithoutPathExpansion(service_path,
-                                           service_properties->DeepCopy());
+  profile->entries.SetWithoutPathExpansion(
+      service_path, service_properties->CreateDeepCopy());
   return true;
 }
 
 void FakeShillProfileClient::GetProfilePaths(
     std::vector<std::string>* profiles) {
   for (const auto& profile : profiles_)
     profiles->push_back(profile->path);
 }
 
 void FakeShillProfileClient::GetProfilePathsContainingService(
@@ skipping 46 matching lines @@
     return false;
   }
 
   if (properties)
     properties->MergeDictionary(entry);
 
   return true;
 }
 
 }  // namespace chromeos