Fix teardown in tests which use UploadFileElementReader.

net/base/upload_file_element_reader_unittest.cc

Index: net/base/upload_file_element_reader_unittest.cc
diff --git a/net/base/upload_file_element_reader_unittest.cc b/net/base/upload_file_element_reader_unittest.cc
index 8224f773046beee8317096143cdea81c0feb446e..4b1f5098f4fd061512a39c940b06637775c2f06f 100644
--- a/net/base/upload_file_element_reader_unittest.cc
+++ b/net/base/upload_file_element_reader_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop_proxy.h"
+#include "base/run_loop.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
@@ -17,7 +18,7 @@ namespace net {
 
 class UploadFileElementReaderTest : public PlatformTest {
  protected:
-  virtual void SetUp() OVERRIDE {
+  UploadFileElementReaderTest() {
     // Some tests (*.ReadPartially) rely on bytes_.size() being even.
     const char kData[] = "123456789abcdefghi";
     bytes_.assign(kData, kData + arraysize(kData) - 1);
@@ -43,6 +44,10 @@ class UploadFileElementReaderTest : public PlatformTest {
     EXPECT_EQ(bytes_.size(), reader_->BytesRemaining());
     EXPECT_FALSE(reader_->IsInMemory());
   }
+  ~UploadFileElementReaderTest() {

[Ryan Sleevi, 2013/09/13 21:57:27]

style nit: virtual
style nit: line break after }

+    reader_.reset();
+    base::RunLoop().RunUntilIdle();
+  }
 
   std::vector<char> bytes_;
   scoped_ptr<UploadElementReader> reader_;