diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-29 17:14:53 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-04 14:29:45 +0100 |
| commit | c407dc5cd9bdc5668497f21b26b09d988ab439de (patch) | |
| tree | 7eaf8707c0309516bdb042ad976feedaf72b0bb1 /base/message_pump_glib_unittest.cc | |
| parent | 0998b1cdac5733f299c12d88bc31ef9c8035b8fa (diff) | |
| download | external_chromium-c407dc5cd9bdc5668497f21b26b09d988ab439de.zip external_chromium-c407dc5cd9bdc5668497f21b26b09d988ab439de.tar.gz external_chromium-c407dc5cd9bdc5668497f21b26b09d988ab439de.tar.bz2 | |
Merge Chromium src@r53293
Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34
Diffstat (limited to 'base/message_pump_glib_unittest.cc')
| -rw-r--r-- | base/message_pump_glib_unittest.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/base/message_pump_glib_unittest.cc b/base/message_pump_glib_unittest.cc index efe1cb4..cb9a84f 100644 --- a/base/message_pump_glib_unittest.cc +++ b/base/message_pump_glib_unittest.cc @@ -182,12 +182,7 @@ class MessagePumpGLibTest : public testing::Test { } // namespace // EventInjector is expected to always live longer than the runnable methods. -// This lets us call NewRunnableMethod on EventInjector instances. -template<> -struct RunnableMethodTraits<EventInjector> { - void RetainCallee(EventInjector* obj) { } - void ReleaseCallee(EventInjector* obj) { } -}; +DISABLE_RUNNABLE_METHOD_REFCOUNT(EventInjector); TEST_F(MessagePumpGLibTest, TestQuit) { // Checks that Quit works and that the basic infrastructure is working. |