summaryrefslogtreecommitdiffstats
path: root/base/json_writer_unittest.cc
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 22:59:43 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 22:59:43 +0000
commit8e50b600ed1e65789109022709cf5c349748fb4c (patch)
treed9d57344003604647e1a96a56ef4d21921ec44c0 /base/json_writer_unittest.cc
parent0c8a8f7aa683ae7d6c8ba176c1db704cc294defb (diff)
downloadchromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.zip
chromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.tar.gz
chromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.tar.bz2
revert broken change 10833
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json_writer_unittest.cc')
-rw-r--r--base/json_writer_unittest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/base/json_writer_unittest.cc b/base/json_writer_unittest.cc
index 2c746fd..cddfd4c 100644
--- a/base/json_writer_unittest.cc
+++ b/base/json_writer_unittest.cc
@@ -4,7 +4,6 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "base/json_writer.h"
-#include "base/string_util.h"
#include "base/values.h"
TEST(JSONWriterTest, Writing) {
@@ -37,10 +36,10 @@ TEST(JSONWriterTest, Writing) {
// list list nesting, etc.
DictionaryValue root_dict;
ListValue* list = new ListValue;
- root_dict.Set(ASCIIToUTF16("list"), list);
+ root_dict.Set(L"list", list);
DictionaryValue* inner_dict = new DictionaryValue;
list->Append(inner_dict);
- inner_dict->SetInteger(ASCIIToUTF16("inner int"), 10);
+ inner_dict->SetInteger(L"inner int", 10);
ListValue* inner_list = new ListValue;
list->Append(inner_list);
list->Append(Value::CreateBooleanValue(true));
@@ -55,3 +54,5 @@ TEST(JSONWriterTest, Writing) {
"}\r\n",
output_js);
}
+
+