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

tools/gn/trace.cc

Index: tools/gn/trace.cc
diff --git a/tools/gn/trace.cc b/tools/gn/trace.cc
index 18082c4776b4913d43bec830f2018690296313a4..aa73eba93b526fa74e0eabbd8c90e1b15c44cb96 100644
--- a/tools/gn/trace.cc
+++ b/tools/gn/trace.cc
@@ -241,7 +241,7 @@
     out << ",\"dur\":" << item.delta().InMicroseconds();
 
     quote_buffer.resize(0);
-    base::EscapeJSONString(item.name(), true, &quote_buffer);
+    base::JsonDoubleQuote(item.name(), true, &quote_buffer);
     out << ",\"name\":" << quote_buffer;
 
     out << ",\"cat\":";
@@ -270,13 +270,13 @@
       bool needs_comma = false;
       if (!item.toolchain().empty()) {
         quote_buffer.resize(0);
-        base::EscapeJSONString(item.toolchain(), true, &quote_buffer);
+        base::JsonDoubleQuote(item.toolchain(), true, &quote_buffer);
         out << "\"toolchain\":" << quote_buffer;
         needs_comma = true;
       }
       if (!item.cmdline().empty()) {
         quote_buffer.resize(0);
-        base::EscapeJSONString(item.cmdline(), true, &quote_buffer);
+        base::JsonDoubleQuote(item.cmdline(), true, &quote_buffer);
         if (needs_comma)
           out << ",";
         out << "\"cmdline\":" << quote_buffer;