diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 14:43:27 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 14:43:27 +0000 |
| commit | a899c0b0e1020347c5fc4bfc9c6d83cf13e8bd4a (patch) | |
| tree | adf4d31e271ad9f54b6faf11be37acab769101c2 /net | |
| parent | c622538f6219a0d9d10878a25e447081b3b3c72c (diff) | |
| download | chromium_src-a899c0b0e1020347c5fc4bfc9c6d83cf13e8bd4a.zip chromium_src-a899c0b0e1020347c5fc4bfc9c6d83cf13e8bd4a.tar.gz chromium_src-a899c0b0e1020347c5fc4bfc9c6d83cf13e8bd4a.tar.bz2 | |
Replaced DictionaryValue::key_iterator by DictionaryValue::Iterator outside of chrome/browser.
Marked Iterator::HasNext() as deprecated and added a method Iterator::CanAdvance() as replacement.
As DictionaryValue::Iterator is actually a const iterator, I had to add several missing const annotations, mostly, in json_schema_validator.* and command.*
BUG=162611
TEST=No new tests. Only semantically equivalent refactorings.
Review URL: https://chromiumcodereview.appspot.com/11418150
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177673 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/spdy/spdy_header_block.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/spdy/spdy_header_block.cc b/net/spdy/spdy_header_block.cc index 3680cb4..0b24a2a 100644 --- a/net/spdy/spdy_header_block.cc +++ b/net/spdy/spdy_header_block.cc @@ -36,11 +36,9 @@ bool SpdyHeaderBlockFromNetLogParam( return false; } - for (base::DictionaryValue::key_iterator it = header_dict->begin_keys(); - it != header_dict->end_keys(); - ++it) { - std::string value; - if (!header_dict->GetString(*it, &(*headers)[*it])) { + for (base::DictionaryValue::Iterator it(*header_dict); !it.IsAtEnd(); + it.Advance()) { + if (!it.value().GetAsString(&(*headers)[it.key()])) { headers->clear(); return false; } |