diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-28 02:19:14 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-28 02:19:14 +0000 |
| commit | 51ea1473b52ba36e1a6ba1e68a713264fa4a76a9 (patch) | |
| tree | d28bc9c72ab4281319fbe03aff9e389947348c8d | |
| parent | 20c0fb304cb1ab7d33bc4ca26a496ecee690bb92 (diff) | |
| download | chromium_src-51ea1473b52ba36e1a6ba1e68a713264fa4a76a9.zip chromium_src-51ea1473b52ba36e1a6ba1e68a713264fa4a76a9.tar.gz chromium_src-51ea1473b52ba36e1a6ba1e68a713264fa4a76a9.tar.bz2 | |
Revert 280429 "Reset host resolver in unittest"
> Reset host resolver in unittest
>
> BUG=386418
>
> Review URL: https://codereview.chromium.org/356933003
TBR=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/342353004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280482 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chromeos/network/host_resolver_impl_chromeos_unittest.cc | 1 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/chromeos/network/host_resolver_impl_chromeos_unittest.cc b/chromeos/network/host_resolver_impl_chromeos_unittest.cc index 76f262e..e27175ed 100644 --- a/chromeos/network/host_resolver_impl_chromeos_unittest.cc +++ b/chromeos/network/host_resolver_impl_chromeos_unittest.cc @@ -68,7 +68,6 @@ class HostResolverImplChromeOSTest : public testing::Test { } virtual void TearDown() OVERRIDE { - host_resolver_.reset(); network_state_handler_.reset(); chromeos::DBusThreadManager::Shutdown(); } diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 4a75134a..622a2ba 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -6192,6 +6192,16 @@ fun:_ZN7WebCore11ImageLoader4Task3runEv } { + bug_386418 + Memcheck:Leak + fun:_Znw* + fun:_ZN4base8internal20PostTaskAndReplyImpl16PostTaskAndReplyERKN15tracked_objects8LocationERKNS_8CallbackIFvvEEESA_ + fun:_ZN4base10WorkerPool16PostTaskAndReplyERKN15tracked_objects8LocationERKNS_8CallbackIFvvEEES9_b + fun:_ZN3net16HostResolverImpl16LoopbackProbeJobC1ERKN4base7WeakPtrIS0_EE + fun:_ZN3net16HostResolverImplC1ERKNS_12HostResolver7OptionsEPNS_6NetLogE + fun:_ZN8chromeos24HostResolverImplChromeOSC1E13* +} +{ bug_387993 Memcheck:Uninitialized fun:_ZN11SkBaseMutex7acquireEv |