| Index: chromeos/dbus/shill_client_unittest_base.cc
|
| diff --git a/chromeos/dbus/shill_client_unittest_base.cc b/chromeos/dbus/shill_client_unittest_base.cc
|
| index c4bb922bbbf4036bd8b1e9c65419ed48d96b6bc8..c8120beaf5db81f33527772da04b2f0343f40646 100644
|
| --- a/chromeos/dbus/shill_client_unittest_base.cc
|
| +++ b/chromeos/dbus/shill_client_unittest_base.cc
|
| @@ -42,7 +42,7 @@ base::DictionaryValue* PopStringToStringDictionary(
|
| !entry_reader.PopString(&key) ||
|
| !entry_reader.PopString(&value))
|
| return NULL;
|
| - result->SetWithoutPathExpansion(key, new base::StringValue(value));
|
| + result->SetWithoutPathExpansion(key, new base::Value(value));
|
| }
|
| return result.release();
|
| }
|
| @@ -316,15 +316,14 @@ ShillClientUnittestBase::CreateExampleServiceProperties() {
|
| base::DictionaryValue* properties = new base::DictionaryValue;
|
| properties->SetWithoutPathExpansion(
|
| shill::kGuidProperty,
|
| - new base::StringValue("00000000-0000-0000-0000-000000000000"));
|
| - properties->SetWithoutPathExpansion(
|
| - shill::kModeProperty, new base::StringValue(shill::kModeManaged));
|
| + new base::Value("00000000-0000-0000-0000-000000000000"));
|
| + properties->SetWithoutPathExpansion(shill::kModeProperty,
|
| + new base::Value(shill::kModeManaged));
|
| properties->SetWithoutPathExpansion(shill::kTypeProperty,
|
| - new base::StringValue(shill::kTypeWifi));
|
| + new base::Value(shill::kTypeWifi));
|
| shill_property_util::SetSSID("testssid", properties);
|
| - properties->SetWithoutPathExpansion(
|
| - shill::kSecurityClassProperty,
|
| - new base::StringValue(shill::kSecurityPsk));
|
| + properties->SetWithoutPathExpansion(shill::kSecurityClassProperty,
|
| + new base::Value(shill::kSecurityPsk));
|
| return properties;
|
| }
|
|
|
|
|