summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-31 21:27:54 +0000
committerjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-31 21:27:54 +0000
commit7e21895521c71517466b5f0ff8b2da452e8087e9 (patch)
tree0012ed295646a925f7c97ccd7e809f2366d72654
parent97cb52a65eb0c9171bbe8913dead5df16874bf05 (diff)
downloadchromium_src-7e21895521c71517466b5f0ff8b2da452e8087e9.zip
chromium_src-7e21895521c71517466b5f0ff8b2da452e8087e9.tar.gz
chromium_src-7e21895521c71517466b5f0ff8b2da452e8087e9.tar.bz2
Autofill: unit test / valgrind; gyp tweak
Fix valgrind error in new unit test. Remove valgrind/heapcheck suppressions. Remove improper reference to a header that does not exist. BUG=102256 TEST= Review URL: http://codereview.chromium.org/8429016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108012 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/autocomplete_history_manager_unittest.cc3
-rw-r--r--content/content_common.gypi1
-rw-r--r--tools/heapcheck/suppressions.txt7
-rw-r--r--tools/valgrind/memcheck/suppressions.txt7
4 files changed, 2 insertions, 16 deletions
diff --git a/chrome/browser/autocomplete_history_manager_unittest.cc b/chrome/browser/autocomplete_history_manager_unittest.cc
index df255f2..f95374e 100644
--- a/chrome/browser/autocomplete_history_manager_unittest.cc
+++ b/chrome/browser/autocomplete_history_manager_unittest.cc
@@ -164,7 +164,8 @@ class AutocompleteHistoryManagerStubSend : public AutocompleteHistoryManager {
WebDataService* wds)
: AutocompleteHistoryManager(tab_contents, profile, wds) {}
- virtual bool Send(IPC::Message* message) { return true; } // intentional nop
+ // Intentionally swallow the message.
+ virtual bool Send(IPC::Message* message) { delete message; return true; }
};
} // namespace
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 46ee9ce..0595c04 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -65,7 +65,6 @@
'common/appcache/appcache_dispatcher.cc',
'common/appcache/appcache_dispatcher.h',
'common/appcache_messages.h',
- 'common/autofill_messages.h',
'common/child_process.cc',
'common/child_process.h',
'common/child_process_host.cc',
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 5ff9da8..5fa51dd 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -1632,10 +1632,3 @@
fun:base::Callback::Run
fun:MessageLoop::RunTask
}
-{
- bug_102256
- Heapcheck:Leak
- ...
- fun:AutocompleteHistoryManager::SendSuggestions
- fun:AutocompleteHistoryManagerTest_ExternalDelegate_Test::TestBody
-}
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 3f3c375..bad5a23 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -5192,13 +5192,6 @@
fun:_ZN22ChromeBrowserMainParts25PreMainMessageLoopRunImplEv
}
{
- bug_102256
- Memcheck:Leak
- fun:_Znw*
- fun:_ZN26AutocompleteHistoryManager15SendSuggestions*
- fun:_ZN52AutocompleteHistoryManagerTest_ExternalDelegate_Test8TestBodyEv
-}
-{
bug_102257
Memcheck:Cond
...