Revert of Deprecate native and extension notification delegates.

content/test/mock_platform_notification_service.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/test/mock_platform_notification_service.h"
 
 #include "base/guid.h"
 #include "base/strings/nullable_string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 146 matching lines @@
     ResourceContext* resource_context,
     const GURL& origin,
     int render_process_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   return CheckPermission(origin);
 }
 
 void MockPlatformNotificationService::Close(
     const std::string& notification_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  NotificationEventDispatcher::GetInstance()->DispatchNonPersistentCloseEvent(
-      notification_id);
-  non_persistent_notifications_.erase(notification_id);
+  const auto non_persistent_iter =
+      non_persistent_notifications_.find(notification_id);
+  if (non_persistent_iter == non_persistent_notifications_.end()) {
+    NotificationEventDispatcher::GetInstance()->DispatchNonPersistentCloseEvent(
+        notification_id);
+    non_persistent_notifications_.erase(non_persistent_iter);
+  }
 }
 
 void MockPlatformNotificationService::ReplaceNotificationIfNeeded(
     const std::string& notification_id) {
   persistent_notifications_.erase(notification_id);
   non_persistent_notifications_.erase(notification_id);
 }
 
 blink::mojom::PermissionStatus MockPlatformNotificationService::CheckPermission(
     const GURL& origin) {
   return blink::mojom::PermissionStatus::GRANTED;
 }
 
 }  // namespace content