Merge the code paths for closing different kinds of notifications.

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

 // 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.
 
 #ifndef WebNotificationManager_h
 #define WebNotificationManager_h
 
 #include "public/platform/WebCallbacks.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebVector.h"
@@ skipping 29 matching lines @@
     // Shows a persistent notification on the user's system. These notifications will have
     // their events delivered to a Service Worker rather than the object's delegate. Will
     // take ownership of the WebNotificationShowCallbacks object.
     virtual void showPersistent(const WebSecurityOrigin&, const WebNotificationData&, std::unique_ptr<WebNotificationResources>, WebServiceWorkerRegistration*, WebNotificationShowCallbacks*) = 0;
 
     // Asynchronously gets the persistent notifications belonging to the Service Worker Registration.
     // If |filterTag| is not an empty string, only the notification with the given tag will be
     // considered. Will take ownership of the WebNotificationGetCallbacks object.
     virtual void getNotifications(const WebString& filterTag, 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.
     virtual void notifyDelegateDestroyed(WebNotificationDelegate*) = 0;
 };
 
 } // namespace blink
 
 #endif // WebNotificationManager_h