From 018d5653f0d29efb9be9b899ea7ca06fe801f683 Mon Sep 17 00:00:00 2001
From: "simonmorris@chromium.org"
 <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 4 Apr 2011 12:15:32 +0000
Subject: The mock input stub deletes the done task.

BUG=78069
TEST=valgrind's "memory test:remoting"

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80302 0039d316-1c4b-4281-b951-d872f2087c98
---
 remoting/host/client_session_unittest.cc | 4 ++++
 tools/heapcheck/suppressions.txt         | 8 --------
 tools/valgrind/memcheck/suppressions.txt | 8 --------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc
index c7568b1..5ce97af 100644
--- a/remoting/host/client_session_unittest.cc
+++ b/remoting/host/client_session_unittest.cc
@@ -31,6 +31,7 @@ using protocol::MockHostStub;
 using protocol::MockInputStub;
 
 using testing::_;
+using testing::DeleteArg;
 using testing::InSequence;
 
 class ClientSessionTest : public testing::Test {
@@ -50,6 +51,9 @@ class ClientSessionTest : public testing::Test {
     credentials_.set_type(protocol::PASSWORD);
     credentials_.set_username("user");
     credentials_.set_credential("password");
+
+    ON_CALL(input_stub_, InjectKeyEvent(_, _)).WillByDefault(DeleteArg<1>());
+    ON_CALL(input_stub_, InjectMouseEvent(_, _)).WillByDefault(DeleteArg<1>());
   }
 
   virtual void TearDown() {
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 6eb6aa0..0fd5b82 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -1249,11 +1249,3 @@
    fun:WebCore::CSSStyleSheet::parseString
    fun:WebCore::parseUASheet
 }
-{
-   bug_78069
-   Heapcheck:Leak
-   fun:remoting::ClientSessionTest_InputStubFilter_Test::TestBody
-   fun:testing::internal::HandleSehExceptionsInMethodIfSupported
-   fun:testing::internal::HandleExceptionsInMethodIfSupported
-   fun:testing::Test::Run
-}
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 195a26c..b6a119a 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -4220,14 +4220,6 @@
    fun:_ZN7browser8NavigateEPNS_14NavigateParamsE
 }
 {
-   bug_78069
-   Memcheck:Leak
-   fun:_Znw*
-   fun:_ZN8remoting38ClientSessionTest_InputStubFilter_Test8TestBodyEv
-   fun:_ZN7testing8internal38HandleSehExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
-   fun:_ZN7testing8internal35HandleExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
-}
-{
    bug_78197
    Memcheck:Cond
    fun:_ZN7WebCore8Document11updateTitleERKNS_19StringWithDirectionE
-- 
cgit v1.1