diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 18:00:22 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 18:00:22 +0000 |
| commit | 4e0f45f5cc4911b529040c82058b255049426e93 (patch) | |
| tree | 6535c84613ab4f672f08b27d2b2d36cffa4bce92 /dbus | |
| parent | f7d2580cf40718cb427f8587e9f1f6f6f837ba39 (diff) | |
| download | chromium_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')
| -rw-r--r-- | dbus/mock_bus.h | 4 | ||||
| -rw-r--r-- | dbus/mock_exported_object.h | 4 | ||||
| -rw-r--r-- | dbus/mock_object_proxy.h | 4 |
3 files changed, 9 insertions, 3 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 diff --git a/dbus/mock_exported_object.h b/dbus/mock_exported_object.h index 07b2f00..e57a83a 100644 --- a/dbus/mock_exported_object.h +++ b/dbus/mock_exported_object.h @@ -19,7 +19,6 @@ class MockExportedObject : public ExportedObject { public: MockExportedObject(Bus* bus, const ObjectPath& object_path); - virtual ~MockExportedObject(); MOCK_METHOD3(ExportMethodAndBlock, bool(const std::string& interface_name, @@ -32,6 +31,9 @@ class MockExportedObject : public ExportedObject { OnExportedCallback on_exported_callback)); MOCK_METHOD1(SendSignal, void(Signal* signal)); MOCK_METHOD0(Unregister, void()); + + protected: + virtual ~MockExportedObject(); }; } // namespace dbus diff --git a/dbus/mock_object_proxy.h b/dbus/mock_object_proxy.h index ff0dcff..1383232 100644 --- a/dbus/mock_object_proxy.h +++ b/dbus/mock_object_proxy.h @@ -20,7 +20,6 @@ class MockObjectProxy : public ObjectProxy { MockObjectProxy(Bus* bus, const std::string& service_name, const ObjectPath& object_path); - virtual ~MockObjectProxy(); MOCK_METHOD2(CallMethodAndBlock, Response*(MethodCall* method_call, int timeout_ms)); @@ -37,6 +36,9 @@ class MockObjectProxy : public ObjectProxy { SignalCallback signal_callback, OnConnectedCallback on_connected_callback)); MOCK_METHOD0(Detach, void()); + + protected: + virtual ~MockObjectProxy(); }; } // namespace dbus |