Revert of Stop doing unnecessary UTF-8 to UTF-16 conversions in JSONWriter.

net/base/net_util.cc

Index: net/base/net_util.cc
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 1f69ee71800b5e7ffeb72f841641993aee8dabeb..241d74859f12d85b96de86b16581748a6e13dfd0 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -1095,7 +1095,7 @@
     result.assign(header.data(), header.size());
 
   result.append("<script>start(");
-  base::EscapeJSONString(title, true, &result);
+  base::JsonDoubleQuote(title, true, &result);
   result.append(");</script>\n");
 
   return result;
@@ -1149,12 +1149,13 @@
                                      Time modified) {
   std::string result;
   result.append("<script>addRow(");
-  base::EscapeJSONString(name, true, &result);
+  base::JsonDoubleQuote(name, true, &result);
   result.append(",");
   if (raw_bytes.empty()) {
-    base::EscapeJSONString(EscapePath(UTF16ToUTF8(name)), true, &result);
+    base::JsonDoubleQuote(EscapePath(UTF16ToUTF8(name)),
+                                   true, &result);
   } else {
-    base::EscapeJSONString(EscapePath(raw_bytes), true, &result);
+    base::JsonDoubleQuote(EscapePath(raw_bytes), true, &result);
   }
   if (is_dir) {
     result.append(",1,");
@@ -1166,7 +1167,7 @@
   base::string16 size_string;
   if (size >= 0)
     size_string = FormatBytesUnlocalized(size);
-  base::EscapeJSONString(size_string, true, &result);
+  base::JsonDoubleQuote(size_string, true, &result);
 
   result.append(",");
 
@@ -1175,7 +1176,7 @@
   if (!modified.is_null()) {
     modified_str = base::TimeFormatShortDateAndTime(modified);
   }
-  base::EscapeJSONString(modified_str, true, &result);
+  base::JsonDoubleQuote(modified_str, true, &result);
 
   result.append(");</script>\n");