Fix memory leak in UrlFetcherTempFileTest.* tests.

chrome/common/net/url_fetcher_unittest.cc

 // Copyright (c) 2011 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 "base/message_loop_proxy.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "net/http/http_response_headers.h"
@@ skipping 339 matching lines @@
   net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot));
   ASSERT_TRUE(test_server.Start());
 
   // Get a small file.
   const char* kFileToFetch = "simple.html";
   expected_file_ = test_server.document_root().AppendASCII(kFileToFetch);
   CreateFetcher(test_server.GetURL(kTestServerFilePrefix + kFileToFetch));
 
   MessageLoop::current()->Run();  // OnURLFetchComplete() will Quit().
 
-  ASSERT_TRUE(file_util::PathExists(temp_file_))
-      << temp_file_.value() << " not found.";
-
-  // Deleting the fetcher should remove the file.
-  delete fetcher_;
-
-  MessageLoop::current()->RunAllPending();
   ASSERT_FALSE(file_util::PathExists(temp_file_))
       << temp_file_.value() << " not removed.";
 }
 
 TEST_F(URLFetcherTempFileTest, LargeGet) {
   net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot));
   ASSERT_TRUE(test_server.Start());
 
   // Get a file large enough to require more than one read into
   // URLFetcher::Core's IOBuffer.
   const char* kFileToFetch = "animate1.gif";
   expected_file_ = test_server.document_root().AppendASCII(kFileToFetch);
   CreateFetcher(test_server.GetURL(kTestServerFilePrefix + kFileToFetch));
 
   MessageLoop::current()->Run();  // OnURLFetchComplete() will Quit().
 }
 
 TEST_F(URLFetcherTempFileTest, CanTakeOwnershipOfFile) {
   net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot));
   ASSERT_TRUE(test_server.Start());
 
   // Get a small file.
   const char* kFileToFetch = "simple.html";
   expected_file_ = test_server.document_root().AppendASCII(kFileToFetch);
   CreateFetcher(test_server.GetURL(kTestServerFilePrefix + kFileToFetch));
 
   MessageLoop::current()->Run();  // OnURLFetchComplete() will Quit().
 
-  ASSERT_TRUE(file_util::PathExists(temp_file_))
-      << temp_file_.value() << " not found.";
-
-  // Deleting the fetcher should remove the file.
-  delete fetcher_;
-
   MessageLoop::current()->RunAllPending();
   ASSERT_FALSE(file_util::PathExists(temp_file_))
       << temp_file_.value() << " not removed.";
 }
 
 // Wrapper that lets us call CreateFetcher() on a thread of our choice.  We
 // could make URLFetcherTest refcounted and use PostTask(FROM_HERE.. ) to call
 // CreateFetcher() directly, but the ownership of the URLFetcherTest is a bit
 // confusing in that case because GTest doesn't know about the refcounting.
 // It's less confusing to just do it this way.
@@ skipping 228 matching lines @@
 
 void URLFetcherTempFileTest::OnURLFetchComplete(const URLFetcher* source) {
   EXPECT_TRUE(source->status().is_success());
   EXPECT_EQ(source->response_code(), 200);
 
   EXPECT_TRUE(source->GetResponseAsFilePath(
       take_ownership_of_temp_file_, &temp_file_));
 
   EXPECT_TRUE(file_util::ContentsEqual(expected_file_, temp_file_));
 
+  delete fetcher_;
+
   io_message_loop_proxy()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 }
 
 void URLFetcherTempFileTest::OnURLFetchComplete(
     const URLFetcher* source,
     const GURL& url,
     const net::URLRequestStatus& status,
     int response_code,
     const net::ResponseCookies& cookies,
     const std::string& data) {
@@ skipping 245 matching lines @@
       FROM_HERE,
       new CurriedTask(new MessageLoop::QuitTask(), MessageLoop::current()));
   MessageLoop::current()->Run();
   EXPECT_EQ(1, GetNumFetcherCores());
   URLFetcher::CancelAll();
   EXPECT_EQ(0, GetNumFetcherCores());
   delete fetcher_;
 }
 
 }  // namespace.