| Index: chromeos/network/favorite_state.cc
|
| diff --git a/chromeos/network/favorite_state.cc b/chromeos/network/favorite_state.cc
|
| index 2bc6b8ef7bd7ca580a05e989729db31abc405559..a365a912916cc978e4114a662851ed2347048bdc 100644
|
| --- a/chromeos/network/favorite_state.cc
|
| +++ b/chromeos/network/favorite_state.cc
|
| @@ -10,6 +10,7 @@
|
| #include "chromeos/network/network_event_log.h"
|
| #include "chromeos/network/network_profile_handler.h"
|
| #include "chromeos/network/network_state.h"
|
| +#include "chromeos/network/shill_property_util.h"
|
| #include "third_party/cros_system_api/dbus/service_constants.h"
|
|
|
| namespace chromeos {
|
| @@ -28,10 +29,13 @@ bool FavoriteState::PropertyChanged(const std::string& key,
|
| if (key == flimflam::kProfileProperty) {
|
| return GetStringValue(key, value, &profile_path_);
|
| } else if (key == flimflam::kUIDataProperty) {
|
| - if (!NetworkState::GetUIDataFromValue(value, &ui_data_)) {
|
| + scoped_ptr<NetworkUIData> new_ui_data =
|
| + shill_property_util::GetUIDataFromValue(value);
|
| + if (!new_ui_data) {
|
| NET_LOG_ERROR("Failed to parse " + key, path());
|
| return false;
|
| }
|
| + ui_data_ = *new_ui_data;
|
| return true;
|
| }
|
| return false;
|
|
|