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..9ad4deca81a3bd4082909a50e4bc0ddcc29e60fe 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"
@@ -18,6 +19,8 @@ namespace net {
 class UploadFileElementReaderTest : public PlatformTest {
  protected:
   virtual void SetUp() OVERRIDE {
+    PlatformTest::SetUp();
+
     // Some tests (*.ReadPartially) rely on bytes_.size() being even.
     const char kData[] = "123456789abcdefghi";
     bytes_.assign(kData, kData + arraysize(kData) - 1);
@@ -44,6 +47,12 @@ class UploadFileElementReaderTest : public PlatformTest {
     EXPECT_FALSE(reader_->IsInMemory());
   }
 
+  virtual void TearDown() OVERRIDE {
+    reader_.reset();
+    base::RunLoop().RunUntilIdle();
+    PlatformTest::TearDown();
+  }

[Ryan Sleevi, 2013/09/13 18:47:10]

Ditto here - it should be possible to update these to
https://code.google.com/p/googletest/wiki/V1_6_FAQ#Should_I_use_the_construct...

+
   std::vector<char> bytes_;
   scoped_ptr<UploadElementReader> reader_;
   base::ScopedTempDir temp_dir_;