summaryrefslogtreecommitdiffstats
path: root/net/base/host_resolver_impl.h
diff options
context:
space:
mode:
authorszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-06 07:56:54 +0000
committerszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-06 07:56:54 +0000
commitc143d892fde4c3aca783825ce92e25fd9fb28d11 (patch)
tree4e1ea712518eca17df478836c0f369906e5d35d3 /net/base/host_resolver_impl.h
parent13169abc0aaffd173439844c9457c2e2eb96ccb2 (diff)
downloadchromium_src-c143d892fde4c3aca783825ce92e25fd9fb28d11.zip
chromium_src-c143d892fde4c3aca783825ce92e25fd9fb28d11.tar.gz
chromium_src-c143d892fde4c3aca783825ce92e25fd9fb28d11.tar.bz2
[net/dns] Remove Job leak when HostResolverImpl is deleted during Abort callback.
R=eroman@chromium.org BUG=83561 TEST=tools/valgrind/chrome_tests.sh -t net --gtest_filter=HostResolverImplTest.DeleteWithinAbortedCallback Review URL: http://codereview.chromium.org/10012030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/host_resolver_impl.h')
-rw-r--r--net/base/host_resolver_impl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/base/host_resolver_impl.h b/net/base/host_resolver_impl.h
index 467b837..f3ded31 100644
--- a/net/base/host_resolver_impl.h
+++ b/net/base/host_resolver_impl.h
@@ -7,11 +7,11 @@
#pragma once
#include <map>
-#include <vector>
#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "base/time.h"
@@ -161,7 +161,7 @@ class NET_EXPORT HostResolverImpl
class Request;
typedef HostCache::Key Key;
typedef std::map<Key, Job*> JobMap;
- typedef std::vector<Request*> RequestsList;
+ typedef ScopedVector<Request> RequestsList;
void set_dns_client_for_tests(scoped_ptr<DnsClient> client) {
dns_client_ = client.Pass();