Clean up logging for push_notifications_*.cc

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/json_writer.h"
+#include "base/logging.h"
+#include "base/string_util.h"
+#include "base/values.h"
+
 namespace notifier {
 
 Subscription::Subscription() {}
 Subscription::~Subscription() {}
 
 bool Subscription::Equals(const Subscription& other) const {
   return channel == other.channel && from == other.from;
 }
 
 namespace {
@@ skipping 34 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 {
-  return "{ channel: \"" + channel + "\", data: \"" + data + "\" }";
+  // Put into a DictionaryValue and convert to a string; this gives a
+  // nice hex-encoding of |data|, which may be a binary string.
+  DictionaryValue dict;
+  dict.SetString("channel", channel);
+  dict.SetString("data", data);
+  std::string str;
+  base::JSONWriter::Write(&dict, &str);
+  return str;
 }
 
 }  // namespace notifier