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

jingle/notifier/listener/notification_defines.cc

 // Copyright (c) 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 "jingle/notifier/listener/notification_defines.h"
 
 #include <cstddef>
 
 #include "base/json/string_escape.h"
 #include "base/logging.h"
@@ skipping 47 matching lines @@
 Notification::~Notification() {}
 
 bool Notification::Equals(const Notification& other) const {
   return
       channel == other.channel &&
       data == other.data &&
       RecipientListsEqual(recipients, other.recipients);
 }
 
 std::string Notification::ToString() const {
-  // |channel| or |data| could hold binary data, so use GetDoubleQuotedJson()
-  // to escape them.
-  const std::string& printable_channel = base::GetDoubleQuotedJson(channel);
-  const std::string& printable_data = base::GetDoubleQuotedJson(data);
+  // |channel| or |data| could hold binary data, so convert all non-ASCII
+  // characters to escape sequences.
+  const std::string& printable_channel =
+      base::EscapeBytesAsInvalidJSONString(channel, true /* put_in_quotes */);
+  const std::string& printable_data =
+      base::EscapeBytesAsInvalidJSONString(data, true /* put_in_quotes */);
   return
       "{ channel: " + printable_channel + ", data: " + printable_data + " }";
 }
 
 }  // namespace notifier