Remove SetWithoutPathExpansion

chromeos/dbus/shill_profile_client_unittest.cc

 // Copyright (c) 2012 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 <utility>
+
 #include "base/bind.h"
+#include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/test/mock_callback.h"
 #include "base/values.h"
 #include "chromeos/dbus/shill_client_unittest_base.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/values_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
@@ skipping 84 matching lines @@
   writer.OpenArray("{sv}", &array_writer);
   dbus::MessageWriter entry_writer(NULL);
   array_writer.OpenDictEntry(&entry_writer);
   entry_writer.AppendString(shill::kEntriesProperty);
   AppendVariantOfArrayOfStrings(&entry_writer,
                                 std::vector<std::string>(1, kExampleEntryPath));
   array_writer.CloseContainer(&entry_writer);
   writer.CloseContainer(&array_writer);
 
   // Create the expected value.
-  base::ListValue* entries = new base::ListValue;
+  auto entries = base::MakeUnique<base::ListValue>();
   entries->AppendString(kExampleEntryPath);
   base::DictionaryValue value;
-  value.SetWithoutPathExpansion(shill::kEntriesProperty, entries);
+  value.SetWithoutPathExpansion(shill::kEntriesProperty, std::move(entries));
   // Set expectations.
   PrepareForMethodCall(shill::kGetPropertiesFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   base::MockCallback<ShillProfileClient::ErrorCallback> error_callback;
   client_->GetProperties(
       dbus::ObjectPath(kDefaultProfilePath),
       base::Bind(&ExpectDictionaryValueResultWithoutStatus, &value),
       error_callback.Get());
@@ skipping 11 matching lines @@
   writer.OpenArray("{sv}", &array_writer);
   dbus::MessageWriter entry_writer(NULL);
   array_writer.OpenDictEntry(&entry_writer);
   entry_writer.AppendString(shill::kTypeProperty);
   entry_writer.AppendVariantOfString(shill::kTypeWifi);
   array_writer.CloseContainer(&entry_writer);
   writer.CloseContainer(&array_writer);
 
   // Create the expected value.
   base::DictionaryValue value;
-  value.SetWithoutPathExpansion(shill::kTypeProperty,
-                                new base::Value(shill::kTypeWifi));
+  value.SetStringWithoutPathExpansion(shill::kTypeProperty, shill::kTypeWifi);
   // Set expectations.
   PrepareForMethodCall(shill::kGetEntryFunction,
                        base::Bind(&ExpectStringArgument, kExampleEntryPath),
                        response.get());
   // Call method.
   base::MockCallback<ShillProfileClient::ErrorCallback> error_callback;
   client_->GetEntry(
       dbus::ObjectPath(kDefaultProfilePath), kExampleEntryPath,
       base::Bind(&ExpectDictionaryValueResultWithoutStatus, &value),
       error_callback.Get());
   EXPECT_CALL(error_callback, Run(_, _)).Times(0);
   // Run the message loop.
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(ShillProfileClientTest, DeleteEntry) {
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Create the expected value.
   base::DictionaryValue value;
-  value.SetWithoutPathExpansion(shill::kOfflineModeProperty,
-                                new base::Value(true));
+  value.SetBooleanWithoutPathExpansion(shill::kOfflineModeProperty, true);
   // Set expectations.
   PrepareForMethodCall(shill::kDeleteEntryFunction,
                        base::Bind(&ExpectStringArgument, kExampleEntryPath),
                        response.get());
   // Call method.
   base::MockCallback<base::Closure> mock_closure;
   base::MockCallback<ShillProfileClient::ErrorCallback> mock_error_callback;
   client_->DeleteEntry(dbus::ObjectPath(kDefaultProfilePath), kExampleEntryPath,
                        mock_closure.Get(), mock_error_callback.Get());
   EXPECT_CALL(mock_closure, Run()).Times(1);
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace chromeos