Index: chromeos/network/network_profile_handler.cc |
diff --git a/chromeos/network/network_profile_handler.cc b/chromeos/network/network_profile_handler.cc |
index 26b1bef8055113d04cdd88326fb51d410f471320..19a47b690c7c0649f179f0aa767b0152bf1432fb 100644 |
--- a/chromeos/network/network_profile_handler.cc |
+++ b/chromeos/network/network_profile_handler.cc |
@@ -75,18 +75,18 @@ void NetworkProfileHandler::GetManagerPropertiesCallback( |
} |
const base::Value* profiles = NULL; |
- properties.GetWithoutPathExpansion(flimflam::kProfilesProperty, &profiles); |
+ properties.GetWithoutPathExpansion(shill::kProfilesProperty, &profiles); |
if (!profiles) { |
LOG(ERROR) << "Manager properties returned from Shill don't contain " |
- << "the field " << flimflam::kProfilesProperty; |
+ << "the field " << shill::kProfilesProperty; |
return; |
} |
- OnPropertyChanged(flimflam::kProfilesProperty, *profiles); |
+ OnPropertyChanged(shill::kProfilesProperty, *profiles); |
} |
void NetworkProfileHandler::OnPropertyChanged(const std::string& name, |
const base::Value& value) { |
- if (name != flimflam::kProfilesProperty) |
+ if (name != shill::kProfilesProperty) |
return; |
const base::ListValue* profiles_value = NULL; |
@@ -141,8 +141,7 @@ void NetworkProfileHandler::GetProfilePropertiesCallback( |
const std::string& profile_path, |
const base::DictionaryValue& properties) { |
std::string userhash; |
- properties.GetStringWithoutPathExpansion(shill::kUserHashProperty, |
- &userhash); |
+ properties.GetStringWithoutPathExpansion(shill::kUserHashProperty, &userhash); |
AddProfile(NetworkProfile(profile_path, userhash)); |
} |