summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorsenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-28 19:21:41 +0000
committersenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-28 19:21:41 +0000
commit359e88bc6b5c70a789b0f5bea155954f0660a232 (patch)
tree8c2114ff268739901f213e2a052bb50e04da8272 /ipc
parent27b51d38027a9927cdc8bc0c8d7eef1d1bcb7108 (diff)
downloadchromium_src-359e88bc6b5c70a789b0f5bea155954f0660a232.zip
chromium_src-359e88bc6b5c70a789b0f5bea155954f0660a232.tar.gz
chromium_src-359e88bc6b5c70a789b0f5bea155954f0660a232.tar.bz2
Reverting 27379, in hopes of fixing browser_tests.
TBR=darin Review URL: http://codereview.chromium.org/248021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27389 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, 2 insertions, 3 deletions
diff --git a/ipc/ipc_logging.cc b/ipc/ipc_logging.cc
index e1684d7..9d4f4bb 100644
--- a/ipc/ipc_logging.cc
+++ b/ipc/ipc_logging.cc
@@ -36,8 +36,8 @@ using base::Time;
// special retention program.
template <>
struct RunnableMethodTraits<IPC::Logging> {
- void RetainCallee(IPC::Logging*) {}
- void ReleaseCallee(IPC::Logging*) {}
+ static void RetainCallee(IPC::Logging*) {}
+ static void ReleaseCallee(IPC::Logging*) {}
};
namespace IPC {
diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc
index f6bf10e..f20f788 100644
--- a/ipc/ipc_sync_channel_unittest.cc
+++ b/ipc/ipc_sync_channel_unittest.cc
@@ -66,7 +66,6 @@ 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);