Fix teardown in tests which use UploadFileElementReader.

net/base/upload_data_stream_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/upload_data_stream.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #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"
 #include "net/base/test_completion_callback.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_file_element_reader.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
@@ skipping 89 matching lines @@
   int init_result_;
 
   // Result value returned from Read().
   int read_result_;
 };
 
 }  // namespace
 
 class UploadDataStreamTest : public PlatformTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  UploadDataStreamTest() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
+  ~UploadDataStreamTest() {

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

style nit: virtual

+    element_readers_.clear();
+    base::RunLoop().RunUntilIdle();
+  }
 
   void FileChangedHelper(const base::FilePath& file_path,
                          const base::Time& time,
                          bool error_expected);
 
   base::ScopedTempDir temp_dir_;
   ScopedVector<UploadElementReader> element_readers_;
 };
 
 TEST_F(UploadDataStreamTest, EmptyUploadData) {
@@ skipping 666 matching lines @@
                 wrapped_buffer2.get(), buf2.size(), read_callback2.callback()));
   EXPECT_EQ(static_cast<int>(buf2.size()), read_callback2.WaitForResult());
   EXPECT_EQ(expected_data, buf2);
   EXPECT_TRUE(stream.IsEOF());
 
   // Make sure callbacks are not called for cancelled operations.
   EXPECT_FALSE(read_callback1.have_result());
 }
 
 }  // namespace net