| 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 c02f0bc2e86325c7e6d81ccc4dcb5995f3c50871..b7013fba9b7e525f83e49801c0cba0f1a328321e 100644
|
| --- a/chromeos/dbus/shill_client_unittest_base.cc
|
| +++ b/chromeos/dbus/shill_client_unittest_base.cc
|
| @@ -196,11 +196,16 @@ void ShillClientUnittestBase::ExpectObjectPathResult(
|
| }
|
|
|
| // static
|
| -void ShillClientUnittestBase::ExpectDictionaryValueResult(
|
| +void ShillClientUnittestBase::ExpectObjectPathResultWithoutStatus(
|
| + const dbus::ObjectPath& expected_result,
|
| + const dbus::ObjectPath& result) {
|
| + EXPECT_EQ(expected_result, result);
|
| +}
|
| +
|
| +// static
|
| +void ShillClientUnittestBase::ExpectDictionaryValueResultWithoutStatus(
|
| const base::DictionaryValue* expected_result,
|
| - DBusMethodCallStatus call_status,
|
| const base::DictionaryValue& result) {
|
| - EXPECT_EQ(DBUS_METHOD_CALL_SUCCESS, call_status);
|
| std::string expected_result_string;
|
| base::JSONWriter::Write(expected_result, &expected_result_string);
|
| std::string result_string;
|
| @@ -208,6 +213,15 @@ void ShillClientUnittestBase::ExpectDictionaryValueResult(
|
| EXPECT_EQ(expected_result_string, result_string);
|
| }
|
|
|
| +// static
|
| +void ShillClientUnittestBase::ExpectDictionaryValueResult(
|
| + const base::DictionaryValue* expected_result,
|
| + DBusMethodCallStatus call_status,
|
| + const base::DictionaryValue& result) {
|
| + EXPECT_EQ(DBUS_METHOD_CALL_SUCCESS, call_status);
|
| + ExpectDictionaryValueResultWithoutStatus(expected_result, result);
|
| +}
|
| +
|
| void ShillClientUnittestBase::OnConnectToSignal(
|
| const std::string& interface_name,
|
| const std::string& signal_name,
|
|
|