diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 02:33:31 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 02:33:31 +0000 |
| commit | 177d7605e55167a48ea1ecd1cc8fd8fe880a62dc (patch) | |
| tree | bba5e45855d1d66a7b611e4b3d53a67ab2c6bd92 | |
| parent | 9bc3b4a5491dbb074d505d4d39a178b76ef28321 (diff) | |
| download | chromium_src-177d7605e55167a48ea1ecd1cc8fd8fe880a62dc.zip chromium_src-177d7605e55167a48ea1ecd1cc8fd8fe880a62dc.tar.gz chromium_src-177d7605e55167a48ea1ecd1cc8fd8fe880a62dc.tar.bz2 | |
Fix an unitialized read in a unit test to appease valgrind
See http://codereview.chromium.org/2908003 for some backstory.
BUG=none
TEST=Webkit Mac memory bot goes green.
Review URL: http://codereview.chromium.org/2825059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52988 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 20 | ||||
| -rw-r--r-- | webkit/glue/media/buffered_data_source.h | 4 | ||||
| -rw-r--r-- | webkit/glue/media/buffered_data_source_unittest.cc | 2 |
3 files changed, 1 insertions, 25 deletions
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 05e96dc..9cbc3ed 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -689,26 +689,6 @@ fun:_ZN12AboutHandler10AboutCrashEv } { - # Valgrind gives false positive on initialized fields in - # BufferedResourceLoader::RestartLoadingTask(). - # see https://bugs.kde.org/show_bug.cgi?id=243992 - valgrind_bug_243992 - Memcheck:Cond - fun:_ZN11webkit_glue22BufferedResourceLoader20DisableDeferIfNeededEv - fun:_ZN11webkit_glue22BufferedResourceLoader13SetAllowDeferEb - fun:_ZN11webkit_glue18BufferedDataSource18RestartLoadingTaskEv - ... -} -{ - # Very similar to the above bug, but in WatchDogTask(). - # see https://bugs.kde.org/show_bug.cgi?id=243992 - valgrind_bug_243992b - Memcheck:Cond - fun:_ZN11webkit_glue22BufferedResourceLoader20DisableDeferIfNeededEv - ... - fun:_ZN11webkit_glue18BufferedDataSource12WatchDogTaskEv -} -{ # Minor commandline options leak in v8 # See http://code.google.com/p/v8/issues/detail?id=275 v8_bug_275 diff --git a/webkit/glue/media/buffered_data_source.h b/webkit/glue/media/buffered_data_source.h index 4aff24b..0dc2115 100644 --- a/webkit/glue/media/buffered_data_source.h +++ b/webkit/glue/media/buffered_data_source.h @@ -126,10 +126,6 @@ class BufferedResourceLoader : protected: friend class base::RefCountedThreadSafe<BufferedResourceLoader>; - // An empty constructor so mock classes can be constructed. - BufferedResourceLoader() { - } - virtual ~BufferedResourceLoader(); private: diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/glue/media/buffered_data_source_unittest.cc index fd07d4e..ce42437 100644 --- a/webkit/glue/media/buffered_data_source_unittest.cc +++ b/webkit/glue/media/buffered_data_source_unittest.cc @@ -511,7 +511,7 @@ TEST_F(BufferedResourceLoaderTest, AllowDefer_DeferredReadPastWindow) { class MockBufferedResourceLoader : public BufferedResourceLoader { public: - MockBufferedResourceLoader() : BufferedResourceLoader() { + MockBufferedResourceLoader() : BufferedResourceLoader(NULL, GURL(), 0, 0) { } MOCK_METHOD2(Start, void(net::CompletionCallback* read_callback, |