Remove deprecated wstring Get(As)String() methods from Value, etc.

chrome/common/json_value_serializer_unittest.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/path_service.h"
+#include "base/string16.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/json_value_serializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(JSONValueSerializerTest, Roundtrip) {
   const std::string original_serialization =
     "{\"bool\":true,\"int\":42,\"list\":[1,2],\"null\":null,\"real\":3.14}";
   JSONStringValueSerializer serializer(original_serialization);
   scoped_ptr<Value> root(serializer.Deserialize(NULL, NULL));
   ASSERT_TRUE(root.get());
   ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
 
   DictionaryValue* root_dict = static_cast<DictionaryValue*>(root.get());
 
   Value* null_value = NULL;
-  ASSERT_TRUE(root_dict->Get(L"null", &null_value));
+  ASSERT_TRUE(root_dict->Get("null", &null_value));
   ASSERT_TRUE(null_value);
   ASSERT_TRUE(null_value->IsType(Value::TYPE_NULL));
 
   bool bool_value = false;
-  ASSERT_TRUE(root_dict->GetBoolean(L"bool", &bool_value));
+  ASSERT_TRUE(root_dict->GetBoolean("bool", &bool_value));
   ASSERT_TRUE(bool_value);
 
   int int_value = 0;
-  ASSERT_TRUE(root_dict->GetInteger(L"int", &int_value));
+  ASSERT_TRUE(root_dict->GetInteger("int", &int_value));
   ASSERT_EQ(42, int_value);
 
   double real_value = 0.0;
-  ASSERT_TRUE(root_dict->GetReal(L"real", &real_value));
+  ASSERT_TRUE(root_dict->GetReal("real", &real_value));
   ASSERT_DOUBLE_EQ(3.14, real_value);
 
   // We shouldn't be able to write using this serializer, since it was
   // initialized with a const string.
   ASSERT_FALSE(serializer.Serialize(*root_dict));
 
   std::string test_serialization = "";
   JSONStringValueSerializer mutable_serializer(&test_serialization);
   ASSERT_TRUE(mutable_serializer.Serialize(*root_dict));
   ASSERT_EQ(original_serialization, test_serialization);
@@ skipping 13 matching lines @@
     "   \"int\": 42," JSON_NEWLINE
     "   \"list\": [ 1, 2 ]," JSON_NEWLINE
     "   \"null\": null," JSON_NEWLINE
     "   \"real\": 3.14" JSON_NEWLINE
     "}" JSON_NEWLINE;
 #undef JSON_NEWLINE
   ASSERT_EQ(pretty_serialization, test_serialization);
 }
 
 TEST(JSONValueSerializerTest, StringEscape) {
-  std::wstring all_chars;
+  string16 all_chars;
   for (int i = 1; i < 256; ++i) {
-    all_chars += static_cast<wchar_t>(i);
+    all_chars += static_cast<char16>(i);
   }
   // Generated in in Firefox using the following js (with an extra backslash for
   // double quote):
   // var s = '';
   // for (var i = 1; i < 256; ++i) { s += String.fromCharCode(i); }
   // uneval(s).replace(/\\/g, "\\\\");
   std::string all_chars_expected =
       "\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\\t\\n\\u000B\\f\\r"
       "\\u000E\\u000F\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017"
       "\\u0018\\u0019\\u001A\\u001B\\u001C\\u001D\\u001E\\u001F !\\\""
@@ skipping 11 matching lines @@
       "\\u00DE\\u00DF\\u00E0\\u00E1\\u00E2\\u00E3\\u00E4\\u00E5\\u00E6\\u00E7"
       "\\u00E8\\u00E9\\u00EA\\u00EB\\u00EC\\u00ED\\u00EE\\u00EF\\u00F0\\u00F1"
       "\\u00F2\\u00F3\\u00F4\\u00F5\\u00F6\\u00F7\\u00F8\\u00F9\\u00FA\\u00FB"
       "\\u00FC\\u00FD\\u00FE\\u00FF";
 
   std::string expected_output = "{\"all_chars\":\"" + all_chars_expected +
                                  "\"}";
   // Test JSONWriter interface
   std::string output_js;
   DictionaryValue valueRoot;
-  valueRoot.SetString(L"all_chars", all_chars);
+  valueRoot.SetString("all_chars", all_chars);
   base::JSONWriter::Write(&valueRoot, false, &output_js);
   ASSERT_EQ(expected_output, output_js);
 
   // Test JSONValueSerializer interface (uses JSONWriter).
   JSONStringValueSerializer serializer(&output_js);
   ASSERT_TRUE(serializer.Serialize(valueRoot));
   ASSERT_EQ(expected_output, output_js);
 }
 
 TEST(JSONValueSerializerTest, UnicodeStrings) {
   // unicode string json -> escaped ascii text
   DictionaryValue root;
-  std::wstring test(L"\x7F51\x9875");
-  root.SetString(L"web", test);
+  string16 test(WideToUTF16(L"\x7F51\x9875"));
+  root.SetString("web", test);
 
   std::string expected = "{\"web\":\"\\u7F51\\u9875\"}";
 
   std::string actual;
   JSONStringValueSerializer serializer(&actual);
   ASSERT_TRUE(serializer.Serialize(root));
   ASSERT_EQ(expected, actual);
 
   // escaped ascii text -> json
   JSONStringValueSerializer deserializer(expected);
   scoped_ptr<Value> deserial_root(deserializer.Deserialize(NULL, NULL));
   ASSERT_TRUE(deserial_root.get());
   DictionaryValue* dict_root =
       static_cast<DictionaryValue*>(deserial_root.get());
-  std::wstring web_value;
-  ASSERT_TRUE(dict_root->GetString(L"web", &web_value));
+  string16 web_value;
+  ASSERT_TRUE(dict_root->GetString("web", &web_value));
   ASSERT_EQ(test, web_value);
 }
 
 TEST(JSONValueSerializerTest, HexStrings) {
   // hex string json -> escaped ascii text
   DictionaryValue root;
-  std::wstring test(L"\x01\x02");
-  root.SetString(L"test", test);
+  string16 test(WideToUTF16(L"\x01\x02"));
+  root.SetString("test", test);
 
   std::string expected = "{\"test\":\"\\u0001\\u0002\"}";
 
   std::string actual;
   JSONStringValueSerializer serializer(&actual);
   ASSERT_TRUE(serializer.Serialize(root));
   ASSERT_EQ(expected, actual);
 
   // escaped ascii text -> json
   JSONStringValueSerializer deserializer(expected);
   scoped_ptr<Value> deserial_root(deserializer.Deserialize(NULL, NULL));
   ASSERT_TRUE(deserial_root.get());
   DictionaryValue* dict_root =
       static_cast<DictionaryValue*>(deserial_root.get());
-  std::wstring test_value;
-  ASSERT_TRUE(dict_root->GetString(L"test", &test_value));
+  string16 test_value;
+  ASSERT_TRUE(dict_root->GetString("test", &test_value));
   ASSERT_EQ(test, test_value);
 
   // Test converting escaped regular chars
   std::string escaped_chars = "{\"test\":\"\\u0067\\u006f\"}";
   JSONStringValueSerializer deserializer2(escaped_chars);
   deserial_root.reset(deserializer2.Deserialize(NULL, NULL));
   ASSERT_TRUE(deserial_root.get());
   dict_root = static_cast<DictionaryValue*>(deserial_root.get());
-  ASSERT_TRUE(dict_root->GetString(L"test", &test_value));
-  ASSERT_EQ(std::wstring(L"go"), test_value);
+  ASSERT_TRUE(dict_root->GetString("test", &test_value));
+  ASSERT_EQ(ASCIIToUTF16("go"), test_value);
 }
 
 TEST(JSONValueSerializerTest, AllowTrailingComma) {
   scoped_ptr<Value> root;
   scoped_ptr<Value> root_expected;
   std::string test_with_commas("{\"key\": [true,],}");
   std::string test_no_commas("{\"key\": [true]}");
 
   JSONStringValueSerializer serializer(test_with_commas);
   serializer.set_allow_trailing_comma(true);
@@ skipping 31 matching lines @@
 
   scoped_ptr<Value> root;
 
   // It's ok to have a comment in a string.
   root.reset(base::JSONReader::Read("[\"// ok\\n /* foo */ \"]", false));
   ASSERT_TRUE(root.get() && root->IsType(Value::TYPE_LIST));
   ListValue* list = static_cast<ListValue*>(root.get());
   ASSERT_EQ(1U, list->GetSize());
   Value* elt = NULL;
   ASSERT_TRUE(list->Get(0, &elt));
-  std::wstring value;
+  std::string value;
   ASSERT_TRUE(elt && elt->GetAsString(&value));
-  ASSERT_EQ(L"// ok\n /* foo */ ", value);
+  ASSERT_EQ("// ok\n /* foo */ ", value);
 
   // You can't nest comments.
   root.reset(base::JSONReader::Read("/* /* inner */ outer */ [ 1 ]", false));
   ASSERT_FALSE(root.get());
 
   // Not a open comment token.
   root.reset(base::JSONReader::Read("/ * * / [1]", false));
   ASSERT_FALSE(root.get());
 }
 
@@ skipping 31 matching lines @@
   JSONFileValueSerializer deserializer(original_file_path);
   scoped_ptr<Value> root;
   root.reset(deserializer.Deserialize(NULL, NULL));
 
   ASSERT_TRUE(root.get());
   ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
 
   DictionaryValue* root_dict = static_cast<DictionaryValue*>(root.get());
 
   Value* null_value = NULL;
-  ASSERT_TRUE(root_dict->Get(L"null", &null_value));
+  ASSERT_TRUE(root_dict->Get("null", &null_value));
   ASSERT_TRUE(null_value);
   ASSERT_TRUE(null_value->IsType(Value::TYPE_NULL));
 
   bool bool_value = false;
-  ASSERT_TRUE(root_dict->GetBoolean(L"bool", &bool_value));
+  ASSERT_TRUE(root_dict->GetBoolean("bool", &bool_value));
   ASSERT_TRUE(bool_value);
 
   int int_value = 0;
-  ASSERT_TRUE(root_dict->GetInteger(L"int", &int_value));
+  ASSERT_TRUE(root_dict->GetInteger("int", &int_value));
   ASSERT_EQ(42, int_value);
 
-  std::wstring string_value;
-  ASSERT_TRUE(root_dict->GetString(L"string", &string_value));
-  ASSERT_EQ(L"hello", string_value);
+  std::string string_value;
+  ASSERT_TRUE(root_dict->GetString("string", &string_value));
+  ASSERT_EQ("hello", string_value);
 
   // Now try writing.
   const FilePath written_file_path =
       test_dir_.Append(FILE_PATH_LITERAL("test_output.js"));
 
   ASSERT_FALSE(file_util::PathExists(written_file_path));
   JSONFileValueSerializer serializer(written_file_path);
   ASSERT_TRUE(serializer.Serialize(*root));
   ASSERT_TRUE(file_util::PathExists(written_file_path));
 
@@ skipping 36 matching lines @@
   FilePath source_file_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &source_file_path));
   source_file_path = source_file_path.Append(
       FILE_PATH_LITERAL("serializer_test_nowhitespace.js"));
   ASSERT_TRUE(file_util::PathExists(source_file_path));
   JSONFileValueSerializer serializer(source_file_path);
   scoped_ptr<Value> root;
   root.reset(serializer.Deserialize(NULL, NULL));
   ASSERT_TRUE(root.get());
 }