Notification testing output should be more inclusive and consistent.

content/shell/renderer/test_runner/notification_presenter.cc

 // Copyright 2014 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 "content/shell/renderer/test_runner/notification_presenter.h"
 
 #include "content/shell/renderer/test_runner/WebTestDelegate.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
@@ skipping 45 matching lines @@
 }
 
 void NotificationPresenter::CancelAllActiveNotifications() {
   while (!active_notifications_.empty()) {
     const WebNotification& notification = active_notifications_.begin()->second;
     cancel(notification);
   }
 }
 
 void NotificationPresenter::Reset() {
-  // TODO(peter): Ensure that |active_notifications_| is empty as well.
+  CancelAllActiveNotifications();
   known_origins_.clear();
+  replacements_.clear();
 }
 
 bool NotificationPresenter::show(const WebNotification& notification) {
   if (!notification.replaceId().isEmpty()) {
     std::string replaceId(notification.replaceId().utf8());
     if (replacements_.find(replaceId) != replacements_.end()) {
       delegate_->printMessage(std::string("REPLACING NOTIFICATION ") +
                               replacements_.find(replaceId)->second + "\n");
     }
     replacements_[replaceId] = notification.title().utf8();
   }
 
-  delegate_->printMessage("DESKTOP NOTIFICATION:");
-  delegate_->printMessage(
-      notification.direction() == WebTextDirectionRightToLeft ? "(RTL)" : "");
-  delegate_->printMessage(" icon ");
-  delegate_->printMessage(notification.iconURL().isEmpty()
-                              ? ""
-                              : notification.iconURL().spec().data());
-  delegate_->printMessage(", title ");
-  delegate_->printMessage(
-      notification.title().isEmpty() ? "" : notification.title().utf8().data());
-  delegate_->printMessage(", text ");
-  delegate_->printMessage(
-      notification.body().isEmpty() ? "" : notification.body().utf8().data());
+  delegate_->printMessage("DESKTOP NOTIFICATION SHOWN: ");
+  if (!notification.title().isEmpty())
+    delegate_->printMessage(notification.title().utf8().data());
+
+  if (notification.direction() == WebTextDirectionRightToLeft)
+    delegate_->printMessage(", RTL");
+
+  // TODO(beverloo): WebNotification should expose the "lang" attribute's value.
+
+  if (!notification.body().isEmpty()) {
+    delegate_->printMessage(std::string(", body: ") +
+                            notification.body().utf8().data());
+  }
+
+  if (!notification.replaceId().isEmpty()) {
+    delegate_->printMessage(std::string(", tag: ") +
+                            notification.replaceId().utf8().data());
+  }
+
+  if (!notification.iconURL().isEmpty()) {
+    delegate_->printMessage(std::string(", icon: ") +
+                            notification.iconURL().spec().data());
+  }
+
   delegate_->printMessage("\n");
 
   std::string title = notification.title().utf8();
   active_notifications_[title] = notification;
 
   Platform::current()->callOnMainThread(DeferredDisplayDispatch,
                                         new WebNotification(notification));
 
   return true;
 }
@@ skipping 33 matching lines @@
 void NotificationPresenter::requestPermission(
     const WebSecurityOrigin& security_origin,
     WebNotificationPermissionCallback* callback) {
   std::string origin = security_origin.toString().utf8();
   delegate_->printMessage("DESKTOP NOTIFICATION PERMISSION REQUESTED: " +
                           origin + "\n");
   callback->permissionRequestComplete();
 }
 
 }  // namespace content