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

sync/syncable/entry.cc

 // Copyright 2012 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 "sync/syncable/entry.h"
 
 #include <iomanip>
 
 #include "base/json/string_escape.h"
 #include "base/strings/string_util.h"
@@ skipping 129 matching lines @@
   os << "Flags: ";
   for ( ; i < BIT_FIELDS_END; ++i) {
     if (kernel->ref(static_cast<BitField>(i)))
       os << g_metas_columns[i].name << ", ";
   }
   for ( ; i < STRING_FIELDS_END; ++i) {
     const std::string& field = kernel->ref(static_cast<StringField>(i));
     os << g_metas_columns[i].name << ": " << field << ", ";
   }
   for ( ; i < PROTO_FIELDS_END; ++i) {
-    std::string escaped_str = base::EscapeBytesAsInvalidJSONString(
+    std::string escaped_str;
+    base::JsonDoubleQuote(
         kernel->ref(static_cast<ProtoField>(i)).SerializeAsString(),
-        false);
+        false,
+        &escaped_str);
     os << g_metas_columns[i].name << ": " << escaped_str << ", ";
   }
   for ( ; i < UNIQUE_POSITION_FIELDS_END; ++i) {
     os << g_metas_columns[i].name << ": "
        << kernel->ref(static_cast<UniquePositionField>(i)).ToDebugString()
        << ", ";
   }
   os << "TempFlags: ";
   for ( ; i < BIT_TEMPS_END; ++i) {
     if (kernel->ref(static_cast<BitTemp>(i)))
       os << "#" << i - BIT_TEMPS_BEGIN << ", ";
   }
   return os;
 }
 
 }  // namespace syncable
 }  // namespace syncer