Fix leak in PrerenderResourceHandlerTest.

chrome/browser/prerender/prerender_resource_handler_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 "chrome/browser/prerender/prerender_resource_handler.h"
 #include "chrome/common/resource_response.h"
 #include "net/http/http_response_headers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ skipping 69 matching lines @@
   }
   return new net::HttpResponseHeaders(headers);
 }
 
 }  // namespace
 
 class PrerenderResourceHandlerTest : public testing::Test {
  protected:
   PrerenderResourceHandlerTest()
       : prerender_duration_(base::TimeDelta::FromSeconds(10)),
-        mock_handler_(new MockResourceHandler()),
         ALLOW_THIS_IN_INITIALIZER_LIST(
             pre_handler_(new PrerenderResourceHandler(
-                mock_handler_,
+                new MockResourceHandler(),
                 NewCallback(
                     this,
                     &PrerenderResourceHandlerTest::SetLastHandledURL)))),
         ui_thread_(BrowserThread::UI, &loop_),
+        io_thread_(BrowserThread::IO, &loop_),
         default_url_("http://www.prerender.com") {
     pre_handler_->set_prerender_duration(prerender_duration_);
     pre_handler_->set_get_current_time_function(&FixedGetCurrentTime);
   }
 
+  virtual ~PrerenderResourceHandlerTest() {
+    // ResourceHandler's will post a task to get deleted when their
+    // reference count go to 0.

[gavinp, 2011/01/18 22:25:06]

The grammar above confused me, especially the apostrophe.  I think a more clear
comment is:

"The ResourceHandlers will post a task to get deleted when their reference count
goes to 0."

[cbentzel, 2011/01/19 13:55:17]

I changed the comment to be clearer.

+    pre_handler_ = NULL;
+    loop_.RunAllPending();
+  }
+
   void SetLastHandledURL(const GURL& url) {
     last_handled_url_ = url;
   }
 
   // Common logic shared by many of the tests
   void StartPrerendering(const std::string& mime_type,
                          const char* headers) {
     int request_id = 1;
     bool defer = false;
     EXPECT_TRUE(pre_handler_->OnWillStart(request_id, default_url_, &defer));
     EXPECT_FALSE(defer);
     scoped_refptr<ResourceResponse> response(new ResourceResponse);
     response->response_head.request_time = FixedGetCurrentTime();
     response->response_head.response_time = FixedGetCurrentTime();
     response->response_head.mime_type = mime_type;
     response->response_head.headers = CreateResponseHeaders(headers);
     EXPECT_TRUE(last_handled_url_.is_empty());
 
     // Start the response. If it is able to prerender, a task will
-    // be posted to loop_ (masquerading as the UI thread), and
-    // |SetLastHandledURL| will be called.
+    // be posted to the UI thread and |SetLastHandledURL| will be called.
     EXPECT_TRUE(pre_handler_->OnResponseStarted(request_id, response));
     loop_.RunAllPending();
   }
 
   base::TimeDelta prerender_duration_;
-  scoped_refptr<MockResourceHandler> mock_handler_;
   scoped_refptr<PrerenderResourceHandler> pre_handler_;
   MessageLoop loop_;
   BrowserThread ui_thread_;
+  BrowserThread io_thread_;
   GURL last_handled_url_;
   GURL default_url_;
 };
 
 namespace {
 
 TEST_F(PrerenderResourceHandlerTest, NoOp) {
 }
 
 // Tests that a valid HTML resource will correctly get diverted
@@ skipping 62 matching lines @@
       "HTTP/1.1 200 OK\n"
       "cache-control: max-age=86400\n");
   EXPECT_TRUE(pre_handler_->OnResponseStarted(request_id, response));
   EXPECT_TRUE(last_handled_url_.is_empty());
   loop_.RunAllPending();
   EXPECT_EQ(url_redirect, last_handled_url_);
 }
 
 }