diff options
Diffstat (limited to 'webkit')
5 files changed, 7 insertions, 31 deletions
diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc index 5dc5d729..85db41a 100644 --- a/webkit/appcache/appcache_request_handler_unittest.cc +++ b/webkit/appcache/appcache_request_handler_unittest.cc @@ -729,8 +729,4 @@ TEST_F(AppCacheRequestHandlerTest, WorkerRequest) { // AppCacheRequestHandlerTest is expected to always live longer than the // runnable methods. This lets us call NewRunnableMethod on its instances. -template<> -struct RunnableMethodTraits<appcache::AppCacheRequestHandlerTest> { - void RetainCallee(appcache::AppCacheRequestHandlerTest* obj) { } - void ReleaseCallee(appcache::AppCacheRequestHandlerTest* obj) { } -}; +DISABLE_RUNNABLE_METHOD_REFCOUNT(appcache::AppCacheRequestHandlerTest); diff --git a/webkit/appcache/appcache_response_unittest.cc b/webkit/appcache/appcache_response_unittest.cc index c0a4eb5..52514ae 100644 --- a/webkit/appcache/appcache_response_unittest.cc +++ b/webkit/appcache/appcache_response_unittest.cc @@ -716,8 +716,4 @@ TEST_F(AppCacheResponseTest, DeleteWithIOPending) { // AppCacheResponseTest is expected to always live longer than the // runnable methods. This lets us call NewRunnableMethod on its instances. -template<> -struct RunnableMethodTraits<appcache::AppCacheResponseTest> { - void RetainCallee(appcache::AppCacheResponseTest* obj) { } - void ReleaseCallee(appcache::AppCacheResponseTest* obj) { } -}; +DISABLE_RUNNABLE_METHOD_REFCOUNT(appcache::AppCacheResponseTest); diff --git a/webkit/appcache/appcache_storage_impl_unittest.cc b/webkit/appcache/appcache_storage_impl_unittest.cc index 304f50f..204f5e6 100644 --- a/webkit/appcache/appcache_storage_impl_unittest.cc +++ b/webkit/appcache/appcache_storage_impl_unittest.cc @@ -1060,8 +1060,4 @@ TEST_F(AppCacheStorageImplTest, FindMainResponseExclusionsInWorkingSet) { // AppCacheStorageImplTest is expected to always live longer than the // runnable methods. This lets us call NewRunnableMethod on its instances. -template<> -struct RunnableMethodTraits<appcache::AppCacheStorageImplTest> { - void RetainCallee(appcache::AppCacheStorageImplTest* obj) { } - void ReleaseCallee(appcache::AppCacheStorageImplTest* obj) { } -}; +DISABLE_RUNNABLE_METHOD_REFCOUNT(appcache::AppCacheStorageImplTest); diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc index 2936d70..665150a 100644 --- a/webkit/appcache/appcache_update_job_unittest.cc +++ b/webkit/appcache/appcache_update_job_unittest.cc @@ -3366,14 +3366,6 @@ TEST_F(AppCacheUpdateJobTest, MultipleHeadersRefetch) { // AppCacheUpdateJobTest is expected to always live longer than the // runnable methods. This lets us call NewRunnableMethod on its instances. -template<> -struct RunnableMethodTraits<appcache::AppCacheUpdateJobTest> { - void RetainCallee(appcache::AppCacheUpdateJobTest* obj) { } - void ReleaseCallee(appcache::AppCacheUpdateJobTest* obj) { } -}; -template<> -struct RunnableMethodTraits<appcache::AppCacheUpdateJobTest::MockAppCachePolicy> -{ - void RetainCallee(appcache::AppCacheUpdateJobTest::MockAppCachePolicy* o) { } - void ReleaseCallee(appcache::AppCacheUpdateJobTest::MockAppCachePolicy* o) { } -}; +DISABLE_RUNNABLE_METHOD_REFCOUNT(appcache::AppCacheUpdateJobTest); +DISABLE_RUNNABLE_METHOD_REFCOUNT( + appcache::AppCacheUpdateJobTest::MockAppCachePolicy); diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc index 330784d..c067fa6 100644 --- a/webkit/appcache/appcache_url_request_job_unittest.cc +++ b/webkit/appcache/appcache_url_request_job_unittest.cc @@ -744,8 +744,4 @@ TEST_F(AppCacheURLRequestJobTest, CancelRequestWithIOPending) { // AppCacheURLRequestJobTest is expected to always live longer than the // runnable methods. This lets us call NewRunnableMethod on its instances. -template<> -struct RunnableMethodTraits<appcache::AppCacheURLRequestJobTest> { - void RetainCallee(appcache::AppCacheURLRequestJobTest* obj) { } - void ReleaseCallee(appcache::AppCacheURLRequestJobTest* obj) { } -}; +DISABLE_RUNNABLE_METHOD_REFCOUNT(appcache::AppCacheURLRequestJobTest); |