Index: chromeos/network/network_configuration_handler.cc |
diff --git a/chromeos/network/network_configuration_handler.cc b/chromeos/network/network_configuration_handler.cc |
index f8acf26ccf661dbf3d7326de11f8274260de636e..7748623e40558b221999677679995ef33c492cc1 100644 |
--- a/chromeos/network/network_configuration_handler.cc |
+++ b/chromeos/network/network_configuration_handler.cc |
@@ -21,8 +21,8 @@ |
#include "chromeos/dbus/shill_profile_client.h" |
#include "chromeos/dbus/shill_service_client.h" |
#include "chromeos/network/network_event_log.h" |
-#include "chromeos/network/network_state.h" |
#include "chromeos/network/network_state_handler.h" |
+#include "chromeos/network/shill_property_util.h" |
#include "dbus/object_path.h" |
#include "third_party/cros_system_api/dbus/service_constants.h" |
@@ -57,8 +57,8 @@ void GetPropertiesCallback( |
const base::DictionaryValue& properties) { |
// Get the correct name from WifiHex if necessary. |
scoped_ptr<base::DictionaryValue> properties_copy(properties.DeepCopy()); |
- std::string name = NetworkState::GetNameFromProperties( |
- service_path, properties); |
+ std::string name = |
+ shill_property_util::GetNameFromProperties(service_path, properties); |
if (!name.empty()) { |
properties_copy->SetStringWithoutPathExpansion( |
flimflam::kNameProperty, name); |