| Index: chromeos/network/network_sms_handler.cc
|
| diff --git a/chromeos/network/network_sms_handler.cc b/chromeos/network/network_sms_handler.cc
|
| index f70314b08f8251242794c8231e31b8b5fecc0c88..770b251d66420b4d0cf012b6cf15d4bda6aba898 100644
|
| --- a/chromeos/network/network_sms_handler.cc
|
| +++ b/chromeos/network/network_sms_handler.cc
|
| @@ -366,13 +366,14 @@ void NetworkSmsHandler::NotifyMessageReceived(
|
|
|
| void NetworkSmsHandler::ManagerPropertiesCallback(
|
| DBusMethodCallStatus call_status,
|
| - const base::DictionaryValue& properties) {
|
| + scoped_ptr<base::DictionaryValue> properties) {
|
| if (call_status != DBUS_METHOD_CALL_SUCCESS) {
|
| LOG(ERROR) << "NetworkSmsHandler: Failed to get manager properties.";
|
| return;
|
| }
|
| const base::Value* value;
|
| - if (!properties.GetWithoutPathExpansion(flimflam::kDevicesProperty, &value) ||
|
| + if (!properties->GetWithoutPathExpansion(
|
| + flimflam::kDevicesProperty, &value) ||
|
| value->GetType() != base::Value::TYPE_LIST) {
|
| LOG(ERROR) << "NetworkSmsHandler: No list value for: "
|
| << flimflam::kDevicesProperty;
|
| @@ -398,7 +399,7 @@ void NetworkSmsHandler::ManagerPropertiesCallback(
|
| void NetworkSmsHandler::DevicePropertiesCallback(
|
| const std::string& device_path,
|
| DBusMethodCallStatus call_status,
|
| - const base::DictionaryValue& properties) {
|
| + scoped_ptr<base::DictionaryValue> properties) {
|
| if (call_status != DBUS_METHOD_CALL_SUCCESS) {
|
| LOG(ERROR) << "NetworkSmsHandler: ERROR: " << call_status
|
| << " For: " << device_path;
|
| @@ -406,7 +407,7 @@ void NetworkSmsHandler::DevicePropertiesCallback(
|
| }
|
|
|
| std::string device_type;
|
| - if (!properties.GetStringWithoutPathExpansion(
|
| + if (!properties->GetStringWithoutPathExpansion(
|
| flimflam::kTypeProperty, &device_type)) {
|
| LOG(ERROR) << "NetworkSmsHandler: No type for: " << device_path;
|
| return;
|
| @@ -415,14 +416,14 @@ void NetworkSmsHandler::DevicePropertiesCallback(
|
| return;
|
|
|
| std::string dbus_connection;
|
| - if (!properties.GetStringWithoutPathExpansion(
|
| + if (!properties->GetStringWithoutPathExpansion(
|
| flimflam::kDBusConnectionProperty, &dbus_connection)) {
|
| LOG(ERROR) << "Device has no DBusConnection Property: " << device_path;
|
| return;
|
| }
|
|
|
| std::string object_path_string;
|
| - if (!properties.GetStringWithoutPathExpansion(
|
| + if (!properties->GetStringWithoutPathExpansion(
|
| flimflam::kDBusObjectProperty, &object_path_string)) {
|
| LOG(ERROR) << "Device has no DBusObject Property: " << device_path;
|
| return;
|
|
|