summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-16 19:52:41 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-16 19:52:41 +0000
commit85d2654929c4b52cd4156e469c5086f3559f5818 (patch)
treee0c16b8590e55091cf2e931968a509bc53f60169
parent1436beffdb58cb0fc90abfb83e32eb386cee61dc (diff)
downloadchromium_src-85d2654929c4b52cd4156e469c5086f3559f5818.zip
chromium_src-85d2654929c4b52cd4156e469c5086f3559f5818.tar.gz
chromium_src-85d2654929c4b52cd4156e469c5086f3559f5818.tar.bz2
Fixed memleak in HeartbeatSenderTest_ProcessResponse.
BUG=66808 TEST=Unittests Review URL: http://codereview.chromium.org/5761003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69448 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--remoting/host/heartbeat_sender_unittest.cc4
-rw-r--r--tools/heapcheck/suppressions.txt6
-rw-r--r--tools/valgrind/memcheck/suppressions.txt7
3 files changed, 2 insertions, 15 deletions
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc
index 9b3edfc..3dd65ff 100644
--- a/remoting/host/heartbeat_sender_unittest.cc
+++ b/remoting/host/heartbeat_sender_unittest.cc
@@ -142,7 +142,7 @@ TEST_F(HeartbeatSenderTest, CreateHeartbeatMessage) {
// Verify that ProcessResponse parses set-interval result.
TEST_F(HeartbeatSenderTest, ProcessResponse) {
- XmlElement* response = new XmlElement(QName("", "iq"));
+ scoped_ptr<XmlElement> response(new XmlElement(QName("", "iq")));
response->AddAttr(QName("", "type"), "result");
XmlElement* result = new XmlElement(
@@ -157,7 +157,7 @@ TEST_F(HeartbeatSenderTest, ProcessResponse) {
set_interval->AddText(base::IntToString(kTestInterval));
scoped_refptr<HeartbeatSender> heartbeat_sender(new HeartbeatSender());
- heartbeat_sender->ProcessResponse(response);
+ heartbeat_sender->ProcessResponse(response.get());
EXPECT_EQ(kTestInterval * 1000, heartbeat_sender->interval_ms_);
}
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 1d674e5..35acad1 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -1142,9 +1142,3 @@
...
fun:MalwareDetailsTest_*
}
-{
- bug_66808
- Heapcheck:Leak
- ...
- fun:remoting::HeartbeatSenderTest_ProcessResponse_Test::TestBody
-}
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 377222b8..923bd21 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -3443,13 +3443,6 @@
fun:_ZN7WebCore11RenderBlock37computeBlockDirectionPositionsForLineEPNS_13RootInlineBoxEPNS_7BidiRunERN3WTF7HashMapIPKNS_13InlineTextBoxESt4pairINS5_6VectorIPKNS_14SimpleFontDataELj0EEENS_13GlyphOverflowEENS5_7PtrHashIS9_EENS5_10HashTraitsIS9_EENSK_ISH_EEEERNS_21VerticalPositionCacheE
}
{
- bug_66808
- Memcheck:Leak
- fun:_Znw*
- ...
- fun:_ZN8remoting40HeartbeatSenderTest_ProcessResponse_Test8TestBodyEv
-}
-{
bug_66853
Memcheck:Leak
fun:_Znw*