Fix teardown in tests which use UploadFileElementReader.

net/base/upload_data_stream_unittest.cc

Index: net/base/upload_data_stream_unittest.cc
diff --git a/net/base/upload_data_stream_unittest.cc b/net/base/upload_data_stream_unittest.cc
index 42b71b9cbea2eab026ca75997409a88e72b898e1..b354c1406deafb189e3c89ac7eeb6ab913606d23 100644
--- a/net/base/upload_data_stream_unittest.cc
+++ b/net/base/upload_data_stream_unittest.cc
@@ -14,6 +14,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
 #include "base/time/time.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ -124,8 +125,14 @@ class MockUploadElementReader : public UploadElementReader {
 class UploadDataStreamTest : public PlatformTest {
  public:
   virtual void SetUp() OVERRIDE {
+    PlatformTest::SetUp();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
+  virtual void TearDown() OVERRIDE {
+    element_readers_.clear();
+    base::RunLoop().RunUntilIdle();
+    PlatformTest::TearDown();
+  }

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

You should be able to update these according to
https://code.google.com/p/googletest/wiki/V1_6_FAQ#Should_I_use_the_construct...

 
   void FileChangedHelper(const base::FilePath& file_path,
                          const base::Time& time,