base::Bind: More low-hanging fruit in webkit/appcache.

BUG=none
TEST=none
R=csilv

Review URL: http://codereview.chromium.org/8949063

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115486 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 42 deletions

diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc
index a7ff8b0..43ae76b 100644
--- a/webkit/appcache/appcache_url_request_job_unittest.cc
+++ b/webkit/appcache/appcache_url_request_job_unittest.cc
@@ -33,7 +33,6 @@ static const char kHttpBasicBody[] = "Hello";
 
 static const int kNumBlocks = 4;
 static const int kBlockSize = 1024;
-static const int kNoSuchResponseId = 123;
 
 class AppCacheURLRequestJobTest : public testing::Test {
  public:
@@ -139,24 +138,13 @@ class AppCacheURLRequestJobTest : public testing::Test {
     }
   }
 
-  // Helper class run a test on our io_thread. The io_thread
-  // is spun up once and reused for all tests.
+  // Helper callback to run a test on our io_thread. The io_thread is spun up
+  // once and reused for all tests.
   template <class Method>
-  class WrapperTask : public Task {
-   public:
-    WrapperTask(AppCacheURLRequestJobTest* test, Method method)
-        : test_(test), method_(method) {
-    }
-
-    virtual void Run() {
-      test_->SetUpTest();
-      (test_->*method_)();
-    }
-
-   private:
-    AppCacheURLRequestJobTest* test_;
-    Method method_;
-  };
+  void MethodWrapper(Method method) {
+    SetUpTest();
+    (this->*method)();
+  }
 
   static void SetUpTestCase() {
     io_thread_.reset(new base::Thread("AppCacheURLRequestJobTest Thread"));
@@ -168,16 +156,14 @@ class AppCacheURLRequestJobTest : public testing::Test {
     io_thread_.reset(NULL);
   }
 
-  AppCacheURLRequestJobTest()
-      : ALLOW_THIS_IN_INITIALIZER_LIST(read_info_callback_(
-            this, &AppCacheURLRequestJobTest::OnReadInfoComplete)) {
-  }
+  AppCacheURLRequestJobTest() {}
 
   template <class Method>
   void RunTestOnIOThread(Method method) {
     test_finished_event_ .reset(new base::WaitableEvent(false, false));
     io_thread_->message_loop()->PostTask(
-        FROM_HERE, new WrapperTask<Method>(this, method));
+        FROM_HERE, base::Bind(&AppCacheURLRequestJobTest::MethodWrapper<Method>,
+                              base::Unretained(this), method));
     test_finished_event_->Wait();
   }
 
@@ -192,12 +178,8 @@ class AppCacheURLRequestJobTest : public testing::Test {
     expected_read_result_ = 0;
     expected_write_result_ = 0;
     written_response_id_ = 0;
-    should_delete_reader_in_completion_callback_ = false;
-    should_delete_writer_in_completion_callback_ = false;
     reader_deletion_count_down_ = 0;
     writer_deletion_count_down_ = 0;
-    read_callback_was_called_ = false;
-    write_callback_was_called_ = false;
   }
 
   void TearDownTest() {
@@ -317,12 +299,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
 
   void OnWriteComplete(int result) {
     EXPECT_FALSE(writer_->IsWritePending());
-    write_callback_was_called_ = true;
     EXPECT_EQ(expected_write_result_, result);
-    if (should_delete_writer_in_completion_callback_ &&
-        --writer_deletion_count_down_ == 0) {
-      writer_.reset();
-    }
     ScheduleNextTask();
   }
 
@@ -334,12 +311,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
 
   void OnReadComplete(int result) {
     EXPECT_FALSE(reader_->IsReadPending());
-    read_callback_was_called_ = true;
     EXPECT_EQ(expected_read_result_, result);
-    if (should_delete_reader_in_completion_callback_ &&
-        --reader_deletion_count_down_ == 0) {
-      reader_.reset();
-    }
     ScheduleNextTask();
   }
 
@@ -765,19 +737,14 @@ class AppCacheURLRequestJobTest : public testing::Test {
   scoped_refptr<HttpResponseInfoIOBuffer> read_info_buffer_;
   scoped_refptr<IOBuffer> read_buffer_;
   int expected_read_result_;
-  net::OldCompletionCallbackImpl<AppCacheURLRequestJobTest> read_info_callback_;
-  bool should_delete_reader_in_completion_callback_;
   int reader_deletion_count_down_;
-  bool read_callback_was_called_;
 
   int64 written_response_id_;
   scoped_ptr<AppCacheResponseWriter> writer_;
   scoped_refptr<HttpResponseInfoIOBuffer> write_info_buffer_;
   scoped_refptr<IOBuffer> write_buffer_;
   int expected_write_result_;
-  bool should_delete_writer_in_completion_callback_;
   int writer_deletion_count_down_;
-  bool write_callback_was_called_;
 
   net::URLRequest::ProtocolFactory* orig_http_factory_;
   scoped_ptr<net::URLRequest> request_;