From 06b5ee60eaefb9efa48d0ce35c275896b659b838 Mon Sep 17 00:00:00 2001
From: "pfeldman@chromium.org"
 <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 26 Jul 2010 09:26:48 +0000
Subject: DevTools: Fix leak in LoadTimingObserverTest. BUG=49828

Review URL: http://codereview.chromium.org/2825067

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53615 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/net/load_timing_observer_unittest.cc | 12 +++++++-----
 tools/heapcheck/suppressions.txt                    |  6 ------
 tools/valgrind/memcheck/suppressions.txt            |  7 -------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/chrome/browser/net/load_timing_observer_unittest.cc b/chrome/browser/net/load_timing_observer_unittest.cc
index 318b254..92af965 100644
--- a/chrome/browser/net/load_timing_observer_unittest.cc
+++ b/chrome/browser/net/load_timing_observer_unittest.cc
@@ -36,16 +36,18 @@ void AddEndEntry(LoadTimingObserver& observer,
 void AddStartURLRequestEntries(LoadTimingObserver& observer,
                                uint32 id,
                                bool request_timing) {
+  scoped_refptr<URLRequestStartEventParameters> params(
+      new URLRequestStartEventParameters(
+          GURL(StringPrintf("http://req%d", id)),
+          "GET",
+          request_timing ? net::LOAD_ENABLE_LOAD_TIMING : 0,
+          net::LOW));
   NetLog::Source source(NetLog::SOURCE_URL_REQUEST, id);
   AddStartEntry(observer, source, NetLog::TYPE_REQUEST_ALIVE, NULL);
   AddStartEntry(observer,
                 source,
                 NetLog::TYPE_URL_REQUEST_START_JOB,
-                new URLRequestStartEventParameters(
-                    GURL(StringPrintf("http://req%d", id)),
-                    "GET",
-                    request_timing ? net::LOAD_ENABLE_LOAD_TIMING : 0,
-                    net::LOW));
+                params.get());
 }
 
 void AddEndURLRequestEntries(LoadTimingObserver& observer, uint32 id) {
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 9da23ea..8578f0c 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -930,12 +930,6 @@
    fun:HTTPTestServer::StartGETRequest
 }
 {
-   bug_49828
-   Heapcheck:Leak
-   ...
-   fun:LoadTimingObserverTest*
-}
-{
    bug_50103_a
    Heapcheck:Leak
    fun:Value::CreateNullValue
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 8a5ecfa..227e956 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -3550,13 +3550,6 @@
    fun:_ZN3net46HttpAuthHandlerNegotiateTest_DisableCname_Test8TestBodyEv
 }
 {
-   bug_49828
-   Memcheck:Leak
-   fun:_Znw*
-   ...
-   fun:*LoadTimingObserverTest*TestBodyEv
-}
-{
    bug_50056
    Memcheck:Leak
    fun:_Znw*
-- 
cgit v1.1