Merge r17560....

net/base/file_stream_unittest.cc

Index: net/base/file_stream_unittest.cc
===================================================================
--- net/base/file_stream_unittest.cc	(revision 19709)
+++ net/base/file_stream_unittest.cc	(working copy)
@@ -184,10 +184,14 @@
   char buf[4];
   rv = stream.Read(buf, arraysize(buf), &callback);
   stream.Close();
-  if (rv == net::ERR_IO_PENDING)
-    rv = callback.WaitForResult();
-  ASSERT_LE(0, rv);
-  EXPECT_EQ(std::string(kTestData, rv), std::string(buf, rv));
+  if (rv < 0) {
+    EXPECT_EQ(net::ERR_IO_PENDING, rv);
+    // The callback should not be called if the request is cancelled.
+    MessageLoop::current()->RunAllPending();
+    EXPECT_FALSE(callback.have_result());
+  } else {
+    EXPECT_EQ(std::string(kTestData, rv), std::string(buf, rv));
+  }
 }
 
 TEST_F(FileStreamTest, BasicRead_FromOffset) {
@@ -360,12 +364,16 @@
                     kTestDataSize - total_bytes_written,
                     &callback);
   stream.Close();
-  if (rv == net::ERR_IO_PENDING)
-    rv = callback.WaitForResult();
-  ASSERT_LT(0, rv);
-  ok = file_util::GetFileSize(temp_file_path(), &file_size);
-  EXPECT_TRUE(ok);
-  EXPECT_EQ(file_size, rv);
+  if (rv < 0) {
+    EXPECT_EQ(net::ERR_IO_PENDING, rv);
+    // The callback should not be called if the request is cancelled.
+    MessageLoop::current()->RunAllPending();
+    EXPECT_FALSE(callback.have_result());
+  } else {
+    ok = file_util::GetFileSize(temp_file_path(), &file_size);
+    EXPECT_TRUE(ok);
+    EXPECT_EQ(file_size, rv);
+  }
 }
 
 TEST_F(FileStreamTest, BasicWrite_FromOffset) {
Property changes on: net\base\file_stream_unittest.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/net/base/file_stream_unittest.cc:r14162,15308,16015,16808,17560