Remove SetWithoutPathExpansion

chromeos/network/network_configuration_handler_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 <stddef.h>
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 461 matching lines @@
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(NetworkConfigurationHandlerTest, CreateConfiguration) {
   std::string networkName = "MyNetwork";
   std::string key = "SSID";
   std::string type = "wifi";
   std::string profile = "profile path";
   base::DictionaryValue value;
   shill_property_util::SetSSID(networkName, &value);
-  value.SetWithoutPathExpansion(shill::kTypeProperty, new base::Value(type));
-  value.SetWithoutPathExpansion(shill::kProfileProperty,
-                                new base::Value(profile));
+  value.SetStringWithoutPathExpansion(shill::kTypeProperty, type);
+  value.SetStringWithoutPathExpansion(shill::kProfileProperty, profile);
 
   EXPECT_CALL(*mock_manager_client_,
               ConfigureServiceForProfile(dbus::ObjectPath(profile), _, _, _))
       .WillOnce(
           Invoke(this, &NetworkConfigurationHandlerTest::OnConfigureService));
   CreateConfiguration("/service/2", value);
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(NetworkConfigurationHandlerTest, RemoveConfiguration) {
   std::string service_path = "/service/2";
 
   // Set up network configuration so the associated network service has the
   // profile path set to |profile|.
   std::string key = "SSID";
   std::string type = "wifi";
   base::DictionaryValue value;
   shill_property_util::SetSSID("Service", &value);
-  value.SetWithoutPathExpansion(shill::kTypeProperty, new base::Value(type));
-  value.SetWithoutPathExpansion(shill::kProfileProperty,
-                                new base::Value("profile2"));
+  value.SetStringWithoutPathExpansion(shill::kTypeProperty, type);
+  value.SetStringWithoutPathExpansion(shill::kProfileProperty, "profile2");
   EXPECT_CALL(*mock_manager_client_,
               ConfigureServiceForProfile(dbus::ObjectPath("profile2"), _, _, _))
       .WillOnce(
           Invoke(this, &NetworkConfigurationHandlerTest::OnConfigureService));
 
   dictionary_value_result_ = &value;
   EXPECT_CALL(*mock_service_client_, GetProperties(_, _))
       .WillRepeatedly(
           Invoke(this, &NetworkConfigurationHandlerTest::OnGetProperties));
 
@@ skipping 28 matching lines @@
 
 TEST_F(NetworkConfigurationHandlerTest, RemoveConfigurationFromCurrentProfile) {
   std::string service_path = "/service/2";
 
   // Set up network configuration so the associated network service has the
   // profile path set to |profile|.
   std::string key = "SSID";
   std::string type = "wifi";
   base::DictionaryValue value;
   shill_property_util::SetSSID("Service", &value);
-  value.SetWithoutPathExpansion(shill::kTypeProperty, new base::Value(type));
-  value.SetWithoutPathExpansion(shill::kProfileProperty,
-                                new base::Value("profile2"));
+  value.SetStringWithoutPathExpansion(shill::kTypeProperty, type);
+  value.SetStringWithoutPathExpansion(shill::kProfileProperty, "profile2");
   EXPECT_CALL(*mock_manager_client_,
               ConfigureServiceForProfile(dbus::ObjectPath("profile2"), _, _, _))
       .WillOnce(
           Invoke(this, &NetworkConfigurationHandlerTest::OnConfigureService));
 
   dictionary_value_result_ = &value;
   EXPECT_CALL(*mock_service_client_, GetProperties(_, _))
       .WillRepeatedly(
           Invoke(this, &NetworkConfigurationHandlerTest::OnGetProperties));
 
@@ skipping 343 matching lines @@
   EXPECT_FALSE(test_observer->HasConfiguration(service_path));
   EXPECT_FALSE(test_observer->HasConfigurationInProfile(
       service_path, NetworkProfileHandler::GetSharedProfilePath()));
   EXPECT_FALSE(
       test_observer->HasConfigurationInProfile(service_path, user_profile));
 
   network_configuration_handler_->RemoveObserver(test_observer.get());
 }
 
 }  // namespace chromeos