diff options
author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 17:51:30 +0000 |
---|---|---|
committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 17:51:30 +0000 |
commit | 5030416098386143fa314dbfe14fa46acdd34198 (patch) | |
tree | acc367f84f0ad0ae20d5ed1d09278fdaa48733ca /webkit/appcache/appcache_update_job_unittest.cc | |
parent | 61af32de2587714e5df7b1892365a9106b273204 (diff) | |
download | chromium_src-5030416098386143fa314dbfe14fa46acdd34198.zip chromium_src-5030416098386143fa314dbfe14fa46acdd34198.tar.gz chromium_src-5030416098386143fa314dbfe14fa46acdd34198.tar.bz2 |
base::Bind: Convert most of webkit/appcache.
BUG=none
TEST=none
R=csilv
Review URL: http://codereview.chromium.org/8991001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115353 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache/appcache_update_job_unittest.cc')
-rw-r--r-- | webkit/appcache/appcache_update_job_unittest.cc | 61 |
1 files changed, 28 insertions, 33 deletions
diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc index 47b1d42..1d6a4ec 100644 --- a/webkit/appcache/appcache_update_job_unittest.cc +++ b/webkit/appcache/appcache_update_job_unittest.cc @@ -978,18 +978,16 @@ class AppCacheUpdateJobTest : public testing::Test, const std::string seed_data(kManifest1Contents); scoped_refptr<net::StringIOBuffer> io_buffer( new net::StringIOBuffer(seed_data)); - write_callback_.reset( - new net::OldCompletionCallbackImpl<AppCacheUpdateJobTest>(this, - &AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData)); - response_writer_->WriteData(io_buffer, seed_data.length(), - write_callback_.get()); + response_writer_->WriteData( + io_buffer, seed_data.length(), + base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, + base::Unretained(this))); // Start update after data write completes asynchronously. } void StartUpdateAfterSeedingStorageData(int result) { ASSERT_GT(result, 0); - write_callback_.reset(); response_writer_.reset(); AppCacheUpdateJob* update = group_->update_job_; @@ -1104,11 +1102,10 @@ class AppCacheUpdateJobTest : public testing::Test, const std::string seed_data("different"); scoped_refptr<net::StringIOBuffer> io_buffer( new net::StringIOBuffer(seed_data)); - write_callback_.reset( - new net::OldCompletionCallbackImpl<AppCacheUpdateJobTest>(this, - &AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData)); - response_writer_->WriteData(io_buffer, seed_data.length(), - write_callback_.get()); + response_writer_->WriteData( + io_buffer, seed_data.length(), + base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, + base::Unretained(this))); // Start update after data write completes asynchronously. } @@ -1167,10 +1164,10 @@ class AppCacheUpdateJobTest : public testing::Test, response_info->headers = headers; // adds ref to headers scoped_refptr<HttpResponseInfoIOBuffer> io_buffer( new HttpResponseInfoIOBuffer(response_info)); // adds ref to info - write_callback_.reset( - new net::OldCompletionCallbackImpl<AppCacheUpdateJobTest>(this, - &AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData)); - response_writer_->WriteInfo(io_buffer, write_callback_.get()); + response_writer_->WriteInfo( + io_buffer, + base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, + base::Unretained(this))); // Start update after data write completes asynchronously. } @@ -1226,10 +1223,10 @@ class AppCacheUpdateJobTest : public testing::Test, response_info->headers = headers; // adds ref to headers scoped_refptr<HttpResponseInfoIOBuffer> io_buffer( new HttpResponseInfoIOBuffer(response_info)); // adds ref to info - write_callback_.reset( - new net::OldCompletionCallbackImpl<AppCacheUpdateJobTest>(this, - &AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData)); - response_writer_->WriteInfo(io_buffer, write_callback_.get()); + response_writer_->WriteInfo( + io_buffer, + base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, + base::Unretained(this))); // Start update after data write completes asynchronously. } @@ -1285,10 +1282,10 @@ class AppCacheUpdateJobTest : public testing::Test, response_info->headers = headers; // adds ref to headers scoped_refptr<HttpResponseInfoIOBuffer> io_buffer( new HttpResponseInfoIOBuffer(response_info)); // adds ref to info - write_callback_.reset( - new net::OldCompletionCallbackImpl<AppCacheUpdateJobTest>(this, - &AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData)); - response_writer_->WriteInfo(io_buffer, write_callback_.get()); + response_writer_->WriteInfo( + io_buffer, + base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, + base::Unretained(this))); // Start update after data write completes asynchronously. } @@ -2666,10 +2663,10 @@ class AppCacheUpdateJobTest : public testing::Test, response_info->headers = headers; // adds ref to headers scoped_refptr<HttpResponseInfoIOBuffer> io_buffer( new HttpResponseInfoIOBuffer(response_info)); // adds ref to info - write_callback_.reset( - new net::OldCompletionCallbackImpl<AppCacheUpdateJobTest>(this, - &AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData)); - response_writer_->WriteInfo(io_buffer, write_callback_.get()); + response_writer_->WriteInfo( + io_buffer, + base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, + base::Unretained(this))); // Start update after data write completes asynchronously. } @@ -2725,10 +2722,10 @@ class AppCacheUpdateJobTest : public testing::Test, response_info->headers = headers; // adds ref to headers scoped_refptr<HttpResponseInfoIOBuffer> io_buffer( new HttpResponseInfoIOBuffer(response_info)); // adds ref to info - write_callback_.reset( - new net::OldCompletionCallbackImpl<AppCacheUpdateJobTest>(this, - &AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData)); - response_writer_->WriteInfo(io_buffer, write_callback_.get()); + response_writer_->WriteInfo( + io_buffer, + base::Bind(&AppCacheUpdateJobTest::StartUpdateAfterSeedingStorageData, + base::Unretained(this))); // Start update after data write completes asynchronously. } @@ -3230,8 +3227,6 @@ class AppCacheUpdateJobTest : public testing::Test, scoped_ptr<base::WaitableEvent> event_; scoped_ptr<AppCacheResponseWriter> response_writer_; - scoped_ptr<net::OldCompletionCallbackImpl<AppCacheUpdateJobTest> > - write_callback_; // Hosts used by an async test that need to live until update job finishes. // Otherwise, test can put host on the stack instead of here. |