summaryrefslogtreecommitdiffstats
path: root/dbus/mock_bus.h
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-18 18:00:22 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-18 18:00:22 +0000
commit4e0f45f5cc4911b529040c82058b255049426e93 (patch)
tree6535c84613ab4f672f08b27d2b2d36cffa4bce92 /dbus/mock_bus.h
parentf7d2580cf40718cb427f8587e9f1f6f6f837ba39 (diff)
downloadchromium_src-4e0f45f5cc4911b529040c82058b255049426e93.zip
chromium_src-4e0f45f5cc4911b529040c82058b255049426e93.tar.gz
chromium_src-4e0f45f5cc4911b529040c82058b255049426e93.tar.bz2
RefCounted types should not have public destructors, Linux fixes
BUG=123295 TEST=none Review URL: https://chromiumcodereview.appspot.com/10392152 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137893 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/mock_bus.h')
-rw-r--r--dbus/mock_bus.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/dbus/mock_bus.h b/dbus/mock_bus.h
index bc25fb6..6a228a6 100644
--- a/dbus/mock_bus.h
+++ b/dbus/mock_bus.h
@@ -18,7 +18,6 @@ namespace dbus {
class MockBus : public Bus {
public:
MockBus(Bus::Options& options);
- virtual ~MockBus();
MOCK_METHOD2(GetObjectProxy, ObjectProxy*(const std::string& service_name,
const ObjectPath& object_path));
@@ -71,6 +70,9 @@ class MockBus : public Bus {
MOCK_METHOD0(HasDBusThread, bool());
MOCK_METHOD0(AssertOnOriginThread, void());
MOCK_METHOD0(AssertOnDBusThread, void());
+
+ protected:
+ virtual ~MockBus();
};
} // namespace dbus