Remove SetWithoutPathExpansion

chromeos/dbus/shill_manager_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 "chromeos/dbus/shill_manager_client.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 121 matching lines @@
   writer.OpenArray("{sv}", &array_writer);
   dbus::MessageWriter entry_writer(NULL);
   array_writer.OpenDictEntry(&entry_writer);
   entry_writer.AppendString(shill::kOfflineModeProperty);
   entry_writer.AppendVariantOfBool(true);
   array_writer.CloseContainer(&entry_writer);
   writer.CloseContainer(&array_writer);
 
   // Create the expected value.
   base::DictionaryValue value;
-  value.SetWithoutPathExpansion(shill::kOfflineModeProperty,
-                                new base::Value(true));
+  value.SetBooleanWithoutPathExpansion(shill::kOfflineModeProperty, true);
   // Set expectations.
   PrepareForMethodCall(shill::kGetPropertiesFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   client_->GetProperties(base::Bind(&ExpectDictionaryValueResult, &value));
   // Run the message loop.
   base::RunLoop().RunUntilIdle();
 }
 
@@ skipping 20 matching lines @@
   property_dict_writer.CloseContainer(&property_entry_writer);
   wap_list_writer.CloseContainer(&property_dict_writer);
   variant_writer.CloseContainer(&wap_list_writer);
   type_entry_writer.CloseContainer(&wap_list_writer);
   type_dict_writer.CloseContainer(&type_entry_writer);
   writer.CloseContainer(&type_dict_writer);
 
 
   // Create the expected value.
   base::DictionaryValue type_dict_value;
-  base::ListValue* type_entry_value = new base::ListValue;
+  auto type_entry_value = base::MakeUnique<base::ListValue>();
   auto property_dict_value = base::MakeUnique<base::DictionaryValue>();
-  property_dict_value->SetWithoutPathExpansion(
-      shill::kGeoMacAddressProperty, new base::Value("01:23:45:67:89:AB"));
+  property_dict_value->SetStringWithoutPathExpansion(
+      shill::kGeoMacAddressProperty, "01:23:45:67:89:AB");
   type_entry_value->Append(std::move(property_dict_value));
-  type_dict_value.SetWithoutPathExpansion("wifi", type_entry_value);
+  type_dict_value.SetWithoutPathExpansion("wifi", std::move(type_entry_value));
 
   // Set expectations.
   PrepareForMethodCall(shill::kGetNetworksForGeolocation,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   client_->GetNetworksForGeolocation(base::Bind(&ExpectDictionaryValueResult,
                                                 &type_dict_value));
 
   // Run the message loop.
@@ skipping 270 matching lines @@
       properties, arguments[7],
       base::Bind(&ExpectStringResultWithoutStatus, expected),
       mock_error_callback.Get());
   EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
 
   // Run the message loop.
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace chromeos