Fix teardown in tests which use UploadFileElementReader.

net/base/upload_file_element_reader_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_file_element_reader.h"
 
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 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);
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     ASSERT_TRUE(file_util::CreateTemporaryFileInDir(temp_dir_.path(),
                                                     &temp_file_path_));
     ASSERT_EQ(
         static_cast<int>(bytes_.size()),
         file_util::WriteFile(temp_file_path_, &bytes_[0], bytes_.size()));
 
     reader_.reset(
         new UploadFileElementReader(base::MessageLoopProxy::current().get(),
                                     temp_file_path_,
                                     0,
                                     kuint64max,
                                     base::Time()));
     TestCompletionCallback callback;
     ASSERT_EQ(ERR_IO_PENDING, reader_->Init(callback.callback()));
     EXPECT_EQ(OK, callback.WaitForResult());
     EXPECT_EQ(bytes_.size(), reader_->GetContentLength());
     EXPECT_EQ(bytes_.size(), reader_->BytesRemaining());
     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_;
   base::FilePath temp_file_path_;
 };
 
 TEST_F(UploadFileElementReaderTest, ReadPartially) {
   const size_t kHalfSize = bytes_.size() / 2;
   ASSERT_EQ(bytes_.size(), kHalfSize * 2);
   std::vector<char> buf(kHalfSize);
@@ skipping 301 matching lines @@
 TEST_F(UploadFileElementReaderSyncTest, WrongPath) {
   const base::FilePath wrong_path(FILE_PATH_LITERAL("wrong_path"));
   reader_.reset(new UploadFileElementReaderSync(
       wrong_path, 0, kuint64max, base::Time()));
   ASSERT_EQ(OK, reader_->Init(CompletionCallback()));
   EXPECT_EQ(0U, reader_->GetContentLength());
   EXPECT_EQ(0U, reader_->BytesRemaining());
 }
 
 }  // namespace net