summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-30 04:29:20 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-30 04:29:20 +0000
commit39fe32a42c9eab376aeefd1ae845085d8828c3ec (patch)
treea183411c44c9c958fd2f4ce05138c316158b94a1 /ipc
parent5924fb63dc581087092336c3449e80a24d848492 (diff)
downloadchromium_src-39fe32a42c9eab376aeefd1ae845085d8828c3ec.zip
chromium_src-39fe32a42c9eab376aeefd1ae845085d8828c3ec.tar.gz
chromium_src-39fe32a42c9eab376aeefd1ae845085d8828c3ec.tar.bz2
Reverting 27389.
Review URL: http://codereview.chromium.org/246027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc_logging.cc4
-rw-r--r--ipc/ipc_sync_channel_unittest.cc1
2 files changed, 3 insertions, 2 deletions
diff --git a/ipc/ipc_logging.cc b/ipc/ipc_logging.cc
index 4232a19..b2ee6bd 100644
--- a/ipc/ipc_logging.cc
+++ b/ipc/ipc_logging.cc
@@ -34,8 +34,8 @@ using base::Time;
// special retention program.
template <>
struct RunnableMethodTraits<IPC::Logging> {
- static void RetainCallee(IPC::Logging*) {}
- static void ReleaseCallee(IPC::Logging*) {}
+ void RetainCallee(IPC::Logging*) {}
+ void ReleaseCallee(IPC::Logging*) {}
};
namespace IPC {
diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc
index f20f788..f6bf10e 100644
--- a/ipc/ipc_sync_channel_unittest.cc
+++ b/ipc/ipc_sync_channel_unittest.cc
@@ -66,6 +66,7 @@ class Worker : public Channel::Listener, public Message::Sender {
}
void AddRef() { }
void Release() { }
+ static bool ImplementsThreadSafeReferenceCounting() { return true; }
bool Send(Message* msg) { return channel_->Send(msg); }
bool SendWithTimeout(Message* msg, int timeout_ms) {
return channel_->SendWithTimeout(msg, timeout_ms);