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

1 files changed, 18 insertions, 1 deletions

diff --git a/base/json/json_writer_unittest.cc b/base/json/json_writer_unittest.cc
index cd2a6fe..e7d0f05 100644
--- a/base/json/json_writer_unittest.cc
+++ b/base/json/json_writer_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -76,6 +76,23 @@ TEST(JSONWriterTest, Writing) {
             "}" JSON_NEWLINE,
             output_js);
 #undef JSON_NEWLINE
+
+  // Test keys with periods
+  DictionaryValue period_dict;
+  period_dict.SetWithoutPathExpansion(L"a.b", Value::CreateIntegerValue(3));
+  period_dict.SetWithoutPathExpansion(L"c", Value::CreateIntegerValue(2));
+  DictionaryValue* period_dict2 = new DictionaryValue;
+  period_dict2->SetWithoutPathExpansion(L"g.h.i.j",
+                                        Value::CreateIntegerValue(1));
+  period_dict.SetWithoutPathExpansion(L"d.e.f", period_dict2);
+  JSONWriter::Write(&period_dict, false, &output_js);
+  ASSERT_EQ("{\"a.b\":3,\"c\":2,\"d.e.f\":{\"g.h.i.j\":1}}", output_js);
+
+  DictionaryValue period_dict3;
+  period_dict3.Set(L"a.b", Value::CreateIntegerValue(2));
+  period_dict3.SetWithoutPathExpansion(L"a.b", Value::CreateIntegerValue(1));
+  JSONWriter::Write(&period_dict3, false, &output_js);
+  ASSERT_EQ("{\"a\":{\"b\":2},\"a.b\":1}", output_js);
 }
 
 }  // namespace base