| Index: chromeos/dbus/shill_device_client.cc
|
| diff --git a/chromeos/dbus/shill_device_client.cc b/chromeos/dbus/shill_device_client.cc
|
| index 12be94df293fb7312ac793c1a0cbeda4d25f694d..12fb9f13254052311223c744172083272a9059a0 100644
|
| --- a/chromeos/dbus/shill_device_client.cc
|
| +++ b/chromeos/dbus/shill_device_client.cc
|
| @@ -36,7 +36,8 @@ class ShillDeviceClientImpl : public ShillDeviceClient {
|
| // seem to imply that it does happen sometimes. Adding CHECKs here
|
| // so we can determine more accurately where the problem lies.
|
| // See: http://crbug.com/170541
|
| - CHECK(iter->second) << "NULL Helper found in helper list.";
|
| + // NULL Helper found in helper list.
|
| + CHECK(iter->second);
|
| delete iter->second;
|
| }
|
| helpers_.clear();
|
| @@ -266,7 +267,8 @@ class ShillDeviceClientImpl : public ShillDeviceClient {
|
| ShillClientHelper* GetHelper(const dbus::ObjectPath& device_path) {
|
| HelperMap::iterator it = helpers_.find(device_path.value());
|
| if (it != helpers_.end()) {
|
| - CHECK(it->second) << "Found a NULL helper in the list.";
|
| + // Found a NULL helper in the list.
|
| + CHECK(it->second);
|
| return it->second;
|
| }
|
|
|
| @@ -274,7 +276,8 @@ class ShillDeviceClientImpl : public ShillDeviceClient {
|
| dbus::ObjectProxy* object_proxy =
|
| bus_->GetObjectProxy(shill::kFlimflamServiceName, device_path);
|
| ShillClientHelper* helper = new ShillClientHelper(object_proxy);
|
| - CHECK(helper) << "Unable to create Shill client helper.";
|
| + // Unable to create Shill client helper.
|
| + CHECK(helper);
|
| helper->MonitorPropertyChanged(shill::kFlimflamDeviceInterface);
|
| helpers_.insert(HelperMap::value_type(device_path.value(), helper));
|
| return helper;
|
|
|