diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 20:47:52 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 20:47:52 +0000 |
| commit | 4dad9ad838f6671fbd67e1c5292525e739e31983 (patch) | |
| tree | 4d79fc17f12752cc221e0e40d16951677da71f92 /chrome/test/ui | |
| parent | 2b3f0f59a6761a41e22007c2c3096e8e18517e08 (diff) | |
| download | chromium_src-4dad9ad838f6671fbd67e1c5292525e739e31983.zip chromium_src-4dad9ad838f6671fbd67e1c5292525e739e31983.tar.gz chromium_src-4dad9ad838f6671fbd67e1c5292525e739e31983.tar.bz2 | |
Many changes to DictionaryValues:
* Add support for keys with "." in them via new XXXWithoutPathExpansion() APIs.
* Use these APIs with all key iterator usage.
* SetXXX() calls cannot fail, so change them from bool to void.
* Change GetSize() to size() since it's cheap, and add empty().
Other:
* Use standard for loop format in more places (e.g. instead of while loops when they're really doing a for loop).
* Shorten a few bits of code.
BUG=567
TEST=none
Review URL: http://codereview.chromium.org/441008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
| -rw-r--r-- | chrome/test/ui/javascript_test_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/ui/javascript_test_util.cc b/chrome/test/ui/javascript_test_util.cc index 17928a2..a2694ae 100644 --- a/chrome/test/ui/javascript_test_util.cc +++ b/chrome/test/ui/javascript_test_util.cc @@ -29,10 +29,10 @@ bool JsonDictionaryToMap(const std::string& json, DictionaryValue* dict = static_cast<DictionaryValue*>(root.get()); - DictionaryValue::key_iterator it = dict->begin_keys(); - for (; it != dict->end_keys(); ++it) { + for (DictionaryValue::key_iterator it = dict->begin_keys(); + it != dict->end_keys(); ++it) { Value* value = NULL; - bool succeeded = dict->Get(*it, &value); + bool succeeded = dict->GetWithoutPathExpansion(*it, &value); EXPECT_TRUE(succeeded); if (!succeeded) |