AU: Proxy Resolver classes

dbus_interface.h

 // Copyright (c) 2010 The Chromium OS 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_PLATFORM_UPDATE_ENGINE_DBUS_INTERFACE_H__
 #define CHROMEOS_PLATFORM_UPDATE_ENGINE_DBUS_INTERFACE_H__
 
 // This class interfaces with DBus. The interface allows it to be mocked.
 
+#include <base/logging.h>
 #include <dbus/dbus-glib.h>
 
 namespace chromeos_update_engine {
 
 class DbusGlibInterface {
  public:
   // wraps dbus_g_proxy_new_for_name_owner
   virtual DBusGProxy* ProxyNewForNameOwner(DBusGConnection* connection,
                                            const char* name,
                                            const char* path,
                                            const char* interface,
                                            GError** error) = 0;
 
   // wraps g_object_unref
   virtual void ProxyUnref(DBusGProxy* proxy) = 0;
 
   // wraps dbus_g_bus_get
   virtual DBusGConnection*  BusGet(DBusBusType type, GError** error) = 0;
   
   // wraps dbus_g_proxy_call
   virtual gboolean ProxyCall(DBusGProxy* proxy,
                              const char* method,
                              GError** error,
                              GType first_arg_type,
                              GType var_arg1,
                              GHashTable** var_arg2,
                              GType var_arg3) = 0;
+  // Mock calls only go up to 10 args, so this is not required to be

[petkov, 2010/11/18 23:26:46]

add an empty line before.

[adlr, 2010/11/19 00:41:06]

this comment was outdated and has been removed. also, made this method pure
virtual like the others.

+  // implemented in the mock.
+  virtual gboolean ProxyCall(DBusGProxy* proxy,
+                             const char* method,
+                             GError** error,
+                             GType, const char*,

[petkov, 2010/11/18 23:26:46]

per style, you have to name the parameters, right?

[adlr, 2010/11/19 00:41:06]

Done.

+                             GType,
+                             GType, gchar**,
+                             GType, GArray**,
+                             GType) {

[petkov, 2010/11/18 23:26:46]

The last argument is always INVALID, right? So you could infer it and remove the
last argument and avoid the 10-argument-limit issues. dbus_g_proxy_call can't
infer it because it uses varargs, I think.

[adlr, 2010/11/19 00:41:06]

i got the mock to implement this, so the impl here has been removed.

[petkov, 2010/11/19 01:09:19]

OK, although the last argument is still unnecessary and can be removed.

[adlr, 2010/11/19 02:00:52]

It's true that it's not necessary since in practice it's always 'invalid', but I
would argue it's nice to keep the interface faithful to the real dbus calls, and
deal with gmocks' trouble with 11-arg functions only in the tests. Should gmock
ever change and support > 10 arg functions, we would probably want the dbus
interface to have 11 args in this function.

+    NOTREACHED();
+    return false;  // appease gcc
+  };
 };
 
 class ConcreteDbusGlib : public DbusGlibInterface {
   virtual DBusGProxy* ProxyNewForNameOwner(DBusGConnection* connection,
                                            const char* name,
                                            const char* path,
                                            const char* interface,
                                            GError** error) {
     return dbus_g_proxy_new_for_name_owner(connection,
                                            name,
@@ skipping 13 matching lines @@
   virtual gboolean ProxyCall(DBusGProxy* proxy,
                              const char* method,
                              GError** error,
                              GType first_arg_type,
                              GType var_arg1,
                              GHashTable** var_arg2,
                              GType var_arg3) {
     return dbus_g_proxy_call(
         proxy, method, error, first_arg_type, var_arg1, var_arg2, var_arg3);
   }
+  virtual gboolean ProxyCall(DBusGProxy* proxy,

[petkov, 2010/11/18 23:26:46]

add an empty line before.

[adlr, 2010/11/19 00:41:06]

Done.

+                             const char* method,
+                             GError** error,
+                             GType var_arg1, const char* var_arg2,
+                             GType var_arg3,
+                             GType var_arg4, gchar** var_arg5,
+                             GType var_arg6, GArray** var_arg7,
+                             GType var_arg8) {
+    return dbus_g_proxy_call(

[petkov, 2010/11/18 23:26:46]

Do you want to use a dbus_g_proxy_call with a timeout, just in case? Or is there
some default timeout that's used here?

[adlr, 2010/11/19 00:41:06]

I think there's a default timeout of 30s, which the other proxy call fn uses.
Should be fine, I think...

+        proxy, method, error, var_arg1, var_arg2, var_arg3,
+        var_arg4, var_arg5, var_arg6, var_arg7, var_arg8);
+  }
 };
 
 }  // namespace chromeos_update_engine
 
 #endif  // CHROMEOS_PLATFORM_UPDATE_ENGINE_DBUS_INTERFACE_H__