diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 00:38:58 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 00:38:58 +0000 |
| commit | 3ebea920942e11fb0c81c83718699ab4e6a6a370 (patch) | |
| tree | bb65049c51fd35a354ab4505802822cb884e3ff5 /net/dns | |
| parent | e19d265c10c73b01717054f2bc7da1797d937bfd (diff) | |
| download | chromium_src-3ebea920942e11fb0c81c83718699ab4e6a6a370.zip chromium_src-3ebea920942e11fb0c81c83718699ab4e6a6a370.tar.gz chromium_src-3ebea920942e11fb0c81c83718699ab4e6a6a370.tar.bz2 | |
base: Make ScopedVector::clear() destroy elements.
This makes ScopedVector's clear() method destroy the
elements before clearing the internal vector, matching the
behavior of the erase() method. I'm moving clear()'s
previous element-preserving behavior into a new weak_clear()
method, matching weak_erase().
I'm also removing ScopedVector::reset(), as it duplicated
clear()'s new behavior and isn't a part of std::vector.
BUG=137909
TEST=added
Review URL: https://chromiumcodereview.appspot.com/10797017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/dns')
| -rw-r--r-- | net/dns/dns_transaction.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc index 600d911..0d07b52 100644 --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc @@ -442,7 +442,7 @@ class DnsTransactionImpl : public DnsTransaction, first_server_index_ = session_->NextFirstServerIndex(); - attempts_.reset(); + attempts_.clear(); return MakeAttempt(); } @@ -586,4 +586,3 @@ scoped_ptr<DnsTransactionFactory> DnsTransactionFactory::CreateFactory( } } // namespace net - |