commit 14e0b9ad2fb85f86e1e31a425144ef2c8538f292
author dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Wed Mar 04 06:49:53 2009 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 09:27:19 2020 +0900
tree 64ea2046f58d6910eea375357947abccd71c80c7
parent af7af1dd3a1efa325f6ec09b28e77ae7face8d4c

Port DictionaryValue to use string16 instead of wstring.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=10818
Review URL: http://codereview.chromium.org/31014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10833 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: 3a79b3cc8393d54d72c8c7e14615fe64d86fd039

base/json_reader_unittest.cc

diff --git a/base/json_reader_unittest.cc b/base/json_reader_unittest.cc
index 9153289..bd64162 100644
--- a/base/json_reader_unittest.cc
+++ b/base/json_reader_unittest.cc
@@ -5,6 +5,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "base/json_reader.h"
 #include "base/scoped_ptr.h"
+#include "base/string_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
 
@@ -297,14 +298,14 @@
   ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
   DictionaryValue* dict_val = static_cast<DictionaryValue*>(root.get());
   real_val = 0.0;
-  ASSERT_TRUE(dict_val->GetReal(L"number", &real_val));
+  ASSERT_TRUE(dict_val->GetReal(ASCIIToUTF16("number"), &real_val));
   ASSERT_DOUBLE_EQ(9.87654321, real_val);
   Value* null_val = NULL;
-  ASSERT_TRUE(dict_val->Get(L"null", &null_val));
+  ASSERT_TRUE(dict_val->Get(ASCIIToUTF16("null"), &null_val));
   ASSERT_TRUE(null_val->IsType(Value::TYPE_NULL));
-  str_val.clear();
-  ASSERT_TRUE(dict_val->GetString(L"S", &str_val));
-  ASSERT_EQ(L"str", str_val);
+  string16 str16_val;
+  ASSERT_TRUE(dict_val->GetString(ASCIIToUTF16("S"), &str16_val));
+  ASSERT_EQ(ASCIIToUTF16("str"), str16_val);
 
   root2.reset(JSONReader::Read(
     "{\"number\":9.87654321, \"null\":null , \"\\x53\" : \"str\", }", true));
@@ -317,15 +318,15 @@
   ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
   dict_val = static_cast<DictionaryValue*>(root.get());
   DictionaryValue* inner_dict = NULL;
-  ASSERT_TRUE(dict_val->GetDictionary(L"inner", &inner_dict));
+  ASSERT_TRUE(dict_val->GetDictionary(ASCIIToUTF16("inner"), &inner_dict));
   ListValue* inner_array = NULL;
-  ASSERT_TRUE(inner_dict->GetList(L"array", &inner_array));
+  ASSERT_TRUE(inner_dict->GetList(ASCIIToUTF16("array"), &inner_array));
   ASSERT_EQ(1U, inner_array->GetSize());
   bool_value = true;
-  ASSERT_TRUE(dict_val->GetBoolean(L"false", &bool_value));
+  ASSERT_TRUE(dict_val->GetBoolean(ASCIIToUTF16("false"), &bool_value));
   ASSERT_FALSE(bool_value);
   inner_dict = NULL;
-  ASSERT_TRUE(dict_val->GetDictionary(L"d", &inner_dict));
+  ASSERT_TRUE(dict_val->GetDictionary(ASCIIToUTF16("d"), &inner_dict));
 
   root2.reset(JSONReader::Read(
     "{\"inner\": {\"array\":[true] , },\"false\":false,\"d\":{},}", true));