Revert r46500 in an attempt to verify a perf regression on the Mac bots.

webkit/tools/test_shell/notification_presenter.cc

 // Copyright (c) 2010 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 "webkit/tools/test_shell/notification_presenter.h"
 
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNotification.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNotificationPermissionCallback.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 
 using WebKit::WebNotification;
 using WebKit::WebNotificationPresenter;
 using WebKit::WebNotificationPermissionCallback;
 using WebKit::WebSecurityOrigin;
 using WebKit::WebString;
 using WebKit::WebURL;
 
 void TestNotificationPresenter::grantPermission(const std::string& origin) {
   // Make sure it's in the form of an origin.
   GURL url(origin);
   allowed_origins_.insert(url.GetOrigin().spec());
 }
 
 // The output from all these methods matches what DumpRenderTree produces.
 bool TestNotificationPresenter::show(const WebNotification& notification) {
-  if (!notification.replaceId().isEmpty()) {
-    std::string replace_id(notification.replaceId().utf8());
-    if (replacements_.find(replace_id) != replacements_.end())
-      printf("REPLACING NOTIFICATION %s\n",
-             replacements_.find(replace_id)->second.c_str());
-
-    WebString identifier = notification.isHTML() ?
-        notification.url().spec().utf16() : notification.title();
-    replacements_[replace_id] = identifier.utf8();
-  }
-
   if (notification.isHTML()) {
     printf("DESKTOP NOTIFICATION: contents at %s\n",
            notification.url().spec().data());
   } else {
-    printf("DESKTOP NOTIFICATION:%s icon %s, title %s, text %s\n",
-           notification.dir() == "rtl" ? "(RTL)" : "",
+    printf("DESKTOP NOTIFICATION: icon %s, title %s, text %s\n",
            notification.iconURL().isEmpty() ? "" :
                notification.iconURL().spec().data(),
            notification.title().isEmpty() ? "" :
                notification.title().utf8().data(),
            notification.body().isEmpty() ? "" :
                notification.body().utf8().data());
   }
 
   WebNotification event_target(notification);
   event_target.dispatchDisplayEvent();
@@ skipping 26 matching lines @@
                  : WebNotificationPresenter::PermissionDenied;
 }
 
 void TestNotificationPresenter::requestPermission(
     const WebSecurityOrigin& origin,
     WebNotificationPermissionCallback* callback) {
   printf("DESKTOP NOTIFICATION PERMISSION REQUESTED: %s\n",
          origin.toString().utf8().data());
   callback->permissionRequestComplete();
 }