This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_client_unittest_base.cc

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..2c8873b8d1cec8b96ef26129fd37ec8db663bcaa 100644
--- a/chromeos/dbus/shill_client_unittest_base.cc
+++ b/chromeos/dbus/shill_client_unittest_base.cc
@@ -43,6 +43,12 @@ ShillClientUnittestBase::MockErrorCallback::MockErrorCallback() {}
 
 ShillClientUnittestBase::MockErrorCallback::~MockErrorCallback() {}
 
+ShillClientUnittestBase::MockPropertyChangeObserver::
+  MockPropertyChangeObserver() {}
+
+ShillClientUnittestBase::MockPropertyChangeObserver::
+  ~MockPropertyChangeObserver() {}
+
 ShillClientHelper::ErrorCallback
 ShillClientUnittestBase::MockErrorCallback::GetCallback() {
   return base::Bind(&MockErrorCallback::Run, base::Unretained(this));
@@ -132,16 +138,6 @@ void ShillClientUnittestBase::SendPropertyChangedSignal(
 }
 
 // static
-void ShillClientUnittestBase::ExpectPropertyChanged(
-    const std::string& expected_name,
-    const base::Value* expected_value,
-    const std::string& name,
-    const base::Value& value) {
-  EXPECT_EQ(expected_name, name);
-  EXPECT_TRUE(expected_value->Equals(&value));
-}
-
-// static
 void ShillClientUnittestBase::ExpectNoArgument(dbus::MessageReader* reader) {
   EXPECT_FALSE(reader->HasMoreData());
 }
@@ -196,11 +192,9 @@ void ShillClientUnittestBase::ExpectObjectPathResult(
 }
 
 // static
-void ShillClientUnittestBase::ExpectDictionaryValueResult(
+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 +202,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,