diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-26 11:57:42 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-26 11:57:42 +0000 |
| commit | fc0d872f14cb231804393f52ba78b833b87ec3a9 (patch) | |
| tree | 383270acac53609ec3c72a3f4cf2525f5c8feb1d /chromeos/network/onc | |
| parent | 720c2561ef3eb93781901899b230e37316e9c6e6 (diff) | |
| download | chromium_src-fc0d872f14cb231804393f52ba78b833b87ec3a9.zip chromium_src-fc0d872f14cb231804393f52ba78b833b87ec3a9.tar.gz chromium_src-fc0d872f14cb231804393f52ba78b833b87ec3a9.tar.bz2 | |
Replacing DictionaryValue::key_iterator by DictionaryValue::Iterator in chrome/browser/{policy,prefs} and chromeos/network/.
This is one of several CLs of a larger refactoring that prepares for the removal of key_iterator.
BUG=162611
Review URL: https://chromiumcodereview.appspot.com/12310104
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/onc')
| -rw-r--r-- | chromeos/network/onc/onc_utils.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc index ecdf6a0..5faad29 100644 --- a/chromeos/network/onc/onc_utils.cc +++ b/chromeos/network/onc/onc_utils.cc @@ -201,14 +201,14 @@ void ExpandStringsInOncObject( } // Recurse into nested objects. - for (base::DictionaryValue::key_iterator it = onc_object->begin_keys(); - it != onc_object->end_keys(); ++it) { + for (base::DictionaryValue::Iterator it(*onc_object); !it.IsAtEnd(); + it.Advance()) { base::DictionaryValue* inner_object = NULL; - if (!onc_object->GetDictionaryWithoutPathExpansion(*it, &inner_object)) + if (!onc_object->GetDictionaryWithoutPathExpansion(it.key(), &inner_object)) continue; const OncFieldSignature* field_signature = - GetFieldSignature(signature, *it); + GetFieldSignature(signature, it.key()); ExpandStringsInOncObject(*field_signature->value_signature, substitution, inner_object); |