Merge the code paths for closing different kinds of notifications.

third_party/WebKit/public/platform/modules/notifications/WebNotificationManager.h

Index: third_party/WebKit/public/platform/modules/notifications/WebNotificationManager.h
diff --git a/third_party/WebKit/public/platform/modules/notifications/WebNotificationManager.h b/third_party/WebKit/public/platform/modules/notifications/WebNotificationManager.h
index 20aa454aff0e34d66ad5479f64c958254ea1eb6a..3496f6e09e1b176fc48917d7802c0a1ebc55c1b1 100644
--- a/third_party/WebKit/public/platform/modules/notifications/WebNotificationManager.h
+++ b/third_party/WebKit/public/platform/modules/notifications/WebNotificationManager.h
@@ -59,13 +59,10 @@ class WebNotificationManager {
                                 WebServiceWorkerRegistration*,
                                 WebNotificationGetCallbacks*) = 0;
 
-  // Closes a notification previously shown, and removes it if being shown.
-  virtual void close(WebNotificationDelegate*) = 0;
-
-  // Closes a persistent notification identified by its notification Id.
-  virtual void closePersistent(const WebSecurityOrigin&,
-                               const WebString& tag,
-                               const WebString& notificationId) = 0;
+  // Closes a notification identified by its notification Id.
+  virtual void close(const WebSecurityOrigin&,
+                     const WebString& tag,
+                     const WebString& notificationId) = 0;
 
   // Indicates that the delegate object is being destroyed, and must no longer
   // be used by the embedder to dispatch events.