This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_client_unittest_base.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_DBUS_SHILL_CLIENT_UNITTEST_BASE_H_
 #define CHROMEOS_DBUS_SHILL_CLIENT_UNITTEST_BASE_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 60 matching lines @@
                             const ArgumentCheckCallback& argument_checker,
                             dbus::Response* response);
 
   // Sends property changed signal to the tested client.
   void SendPropertyChangedSignal(dbus::Signal* signal);
 
   // Checks the name and the value which are sent by PropertyChanged signal.
   static void ExpectPropertyChanged(const std::string& expected_name,
                                     const base::Value* expected_value,
                                     const std::string& name,
                                     const base::Value& value);

[hashimoto, 2012/09/24 02:28:56]

nit: Please keep a blank line here.

[Greg Spencer (Chromium), 2012/09/24 21:50:54]

Done.

-
   // Expects the reader to be empty.
   static void ExpectNoArgument(dbus::MessageReader* reader);
 
   // Expects the reader to have a string.
   static void ExpectStringArgument(const std::string& expected_string,
                                    dbus::MessageReader* reader);
 
   // Expects the reader to have a Value.
   static void ExpectValueArgument(const base::Value* expected_value,
                                   dbus::MessageReader* reader);
 
   // Expects the reader to have a string and a Value.
   static void ExpectStringAndValueArguments(const std::string& expected_string,
                                             const base::Value* expected_value,
                                             dbus::MessageReader* reader);
 
   // Expects the call status to be SUCCESS.
   static void ExpectNoResultValue(DBusMethodCallStatus call_status);
 
   // Checks the result and expects the call status to be SUCCESS.
   static void ExpectObjectPathResult(const dbus::ObjectPath& expected_result,
                                      DBusMethodCallStatus call_status,
                                      const dbus::ObjectPath& result);
 
   // Checks the result and expects the call status to be SUCCESS.
+  static void ExpectObjectPathResultWithoutStatus(
+      const dbus::ObjectPath& expected_result,
+      const dbus::ObjectPath& result);
+
+  // Checks the result and expects the call status to be SUCCESS.
   static void ExpectDictionaryValueResult(
       const base::DictionaryValue* expected_result,
       DBusMethodCallStatus call_status,
       const base::DictionaryValue& result);
+  static void ExpectDictionaryValueResultWithoutStatus(

[hashimoto, 2012/09/24 02:28:56]

Please add a blank line and a method comment before this method.

[Greg Spencer (Chromium), 2012/09/24 21:50:54]

Done.

+      const base::DictionaryValue* expected_result,
+      const base::DictionaryValue& result);
 
   // A message loop to emulate asynchronous behavior.
   MessageLoop message_loop_;
   // The mock bus.
   scoped_refptr<dbus::MockBus> mock_bus_;
 
  private:
   // Checks the requested interface name and signal name.
   // Used to implement the mock proxy.
   void OnConnectToSignal(
@@ skipping 34 matching lines @@
   std::string expected_method_name_;
   // The response which the mock object proxy returns.
   dbus::Response* response_;
   // A callback to intercept and check the method call arguments.
   ArgumentCheckCallback argument_checker_;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_SHILL_CLIENT_UNITTEST_BASE_H_