Clean up shill fake implementations

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 "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_piece.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ skipping 488 matching lines @@
   scoped_ptr<TestObserver> test_observer_;
   base::MessageLoopForUI message_loop_;
   std::string success_callback_name_;
   std::string get_properties_path_;
   scoped_ptr<base::DictionaryValue> get_properties_;
   std::string create_service_path_;
 };
 
 TEST_F(NetworkConfigurationHandlerStubTest, StubSetAndClearProperties) {
   // TODO(stevenjb): Remove dependency on default Stub service.
-  const std::string service_path("wifi1");
+  const std::string service_path("/service/wifi1");
   const std::string test_identity("test_identity");
   const std::string test_passphrase("test_passphrase");
 
   // Set Properties
   base::DictionaryValue properties_to_set;
   properties_to_set.SetStringWithoutPathExpansion(
       shill::kIdentityProperty, test_identity);
   properties_to_set.SetStringWithoutPathExpansion(
       shill::kPassphraseProperty, test_passphrase);
   network_configuration_handler_->SetProperties(
@@ skipping 31 matching lines @@
   EXPECT_EQ("ClearProperties", success_callback_name_);
   EXPECT_FALSE(GetServiceStringProperty(
       service_path, shill::kIdentityProperty, &identity));
   EXPECT_FALSE(GetServiceStringProperty(
       service_path, shill::kIdentityProperty, &passphrase));
   EXPECT_EQ(2, test_observer_->PropertyUpdatesForService(service_path));
 }
 
 TEST_F(NetworkConfigurationHandlerStubTest, StubGetNameFromWifiHex) {
   // TODO(stevenjb): Remove dependency on default Stub service.
-  const std::string service_path("wifi1");
+  const std::string service_path("/service/wifi1");
   std::string wifi_hex = "5468697320697320484558205353494421";
   std::string expected_name = "This is HEX SSID!";
 
   // Set Properties
   base::DictionaryValue properties_to_set;
   properties_to_set.SetStringWithoutPathExpansion(
       shill::kWifiHexSsid, wifi_hex);
   network_configuration_handler_->SetProperties(
       service_path,
       properties_to_set,
@@ skipping 14 matching lines @@
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(service_path, get_properties_path_);
   std::string name_result;
   EXPECT_TRUE(GetReceivedStringProperty(
       service_path, shill::kNameProperty, &name_result));
   EXPECT_EQ(expected_name, name_result);
 }
 
 TEST_F(NetworkConfigurationHandlerStubTest, StubCreateConfiguration) {
-  const std::string service_path("test_wifi");
+  const std::string service_path("/service/test_wifi");
   base::DictionaryValue properties;
   shill_property_util::SetSSID(service_path, &properties);
   properties.SetStringWithoutPathExpansion(shill::kNameProperty, service_path);
   properties.SetStringWithoutPathExpansion(shill::kGuidProperty, service_path);
   properties.SetStringWithoutPathExpansion(
       shill::kTypeProperty, shill::kTypeWifi);
   properties.SetStringWithoutPathExpansion(
       shill::kStateProperty, shill::kStateIdle);
   properties.SetStringWithoutPathExpansion(
       shill::kProfileProperty, NetworkProfileHandler::GetSharedProfilePath());
@@ skipping 13 matching lines @@
       create_service_path_, shill::kGuidProperty, &guid));
   EXPECT_EQ(service_path, guid);
 
   std::string actual_profile;
   EXPECT_TRUE(GetServiceStringProperty(
       create_service_path_, shill::kProfileProperty, &actual_profile));
   EXPECT_EQ(NetworkProfileHandler::GetSharedProfilePath(), actual_profile);
 }
 
 }  // namespace chromeos