LocalFileReaderTest leak fix.

BUG=123302
TEST=LocalFileReaderTest.*

Review URL: https://chromiumcodereview.appspot.com/10260002

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

1 files changed, 10 insertions, 7 deletions

diff --git a/webkit/blob/local_file_reader_unittest.cc b/webkit/blob/local_file_reader_unittest.cc
index 6ddf0eb..595481e 100644
--- a/webkit/blob/local_file_reader_unittest.cc
+++ b/webkit/blob/local_file_reader_unittest.cc
@@ -48,9 +48,8 @@ void ReadFromReader(LocalFileReader* reader,
   }
 }
 
-void NeverCalled(int) {
-  ADD_FAILURE();
-}
+void NeverCalled(int) { ADD_FAILURE(); }
+void EmptyCallback() {}
 
 void QuitLoop() {
   MessageLoop::current()->Quit();
@@ -76,8 +75,7 @@ class LocalFileReaderTest : public testing::Test {
 
   virtual void TearDown() OVERRIDE {
     // Give another chance for deleted streams to perform Close.
-    MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&QuitLoop));
-    MessageLoop::current()->Run();
+    MessageLoop::current()->RunAllPending();
     file_thread_.Stop();
   }
 
@@ -107,11 +105,16 @@ class LocalFileReaderTest : public testing::Test {
 
   FilePath test_dir() const { return dir_.path(); }
   FilePath test_path() const { return dir_.path().AppendASCII("test"); }
-
   base::Time test_file_modification_time() const {
     return test_file_modification_time_;
   }
 
+  void EnsureFileTaskFinished() {
+    file_task_runner()->PostTaskAndReply(
+        FROM_HERE, base::Bind(&EmptyCallback), base::Bind(&QuitLoop));
+    MessageLoop::current()->Run();
+  }
+
  private:
   MessageLoop message_loop_;
   base::Thread file_thread_;
@@ -252,7 +255,7 @@ TEST_F(LocalFileReaderTest, DeleteWithUnfinishedRead) {
   // Delete immediately.
   // Should not crash; nor should NeverCalled be callback.
   reader.reset();
-  MessageLoop::current()->RunAllPending();
+  EnsureFileTaskFinished();
 }
 
 }  // namespace webkit_blob