summaryrefslogtreecommitdiffstats
path: root/dbus/object_proxy.h
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 05:18:29 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 05:18:29 +0000
commitb8ae051ea8edaefb9f787bdca704e2df1adfb89f (patch)
treef26c2509c5f31de44d9446d17be64666558bdfcc /dbus/object_proxy.h
parent2517cfa5066e63e6ed2642779ea57616ae49eb42 (diff)
downloadchromium_src-b8ae051ea8edaefb9f787bdca704e2df1adfb89f.zip
chromium_src-b8ae051ea8edaefb9f787bdca704e2df1adfb89f.tar.gz
chromium_src-b8ae051ea8edaefb9f787bdca704e2df1adfb89f.tar.bz2
Add mock classes for Bus, ObjectProxy, and ExportedObject.
Also add mock_unittest.cc that demonstrates how to mock synchronos and asynchronos D-Bus method calls. BUG=90036 TEST=dbus_unittests Review URL: http://codereview.chromium.org/7714030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/object_proxy.h')
-rw-r--r--dbus/object_proxy.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/dbus/object_proxy.h b/dbus/object_proxy.h
index ae9bd9a3..f75e330 100644
--- a/dbus/object_proxy.h
+++ b/dbus/object_proxy.h
@@ -6,6 +6,7 @@
#define DBUS_OBJECT_PROXY_H_
#pragma once
+#include <map>
#include <string>
#include <vector>
#include <dbus/dbus.h>
@@ -104,9 +105,12 @@ class ObjectProxy : public base::RefCountedThreadSafe<ObjectProxy> {
// BLOCKING CALL.
virtual void Detach();
+ protected:
+ // This is protected, so we can define sub classes.
+ virtual ~ObjectProxy();
+
private:
friend class base::RefCountedThreadSafe<ObjectProxy>;
- virtual ~ObjectProxy();
// Struct of data we'll be passing from StartAsyncMethodCall() to
// OnPendingCallIsCompleteThunk().