Make GetDisplayedNotifications asynchronous.

content/shell/browser/layout_test/layout_test_notification_manager.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/browser/layout_test/layout_test_notification_manager.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 65 matching lines @@
 }
 
 void LayoutTestNotificationManager::ClosePersistentNotification(
     BrowserContext* browser_context,
     const std::string& notification_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   persistent_notifications_.erase(notification_id);
 }
 
-bool LayoutTestNotificationManager::GetDisplayedNotifications(
+void LayoutTestNotificationManager::GetDisplayedNotifications(
     BrowserContext* browser_context,
-    std::set<std::string>* displayed_notifications) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  DCHECK(displayed_notifications);
-
-  // Notifications will never outlive the lifetime of running layout tests.
-  return false;
+    const DisplayedNotificationsCallback& callback) {
+  auto displayed_notifications = base::MakeUnique<std::set<std::string>>();
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(callback, base::Passed(&displayed_notifications),
+                 false /* supports_synchronization */));
 }
 
 void LayoutTestNotificationManager::SimulateClick(
     const std::string& title,
     int action_index,
     const base::NullableString16& reply) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   const auto notification_id_iter = notification_id_map_.find(title);
   if (notification_id_iter == notification_id_map_.end())
     return;
 
   const std::string& notification_id = notification_id_iter->second;
 
   const auto persistent_iter = persistent_notifications_.find(notification_id);
   const auto non_persistent_iter =
       non_persistent_notifications_.find(notification_id);
 
   if (persistent_iter != persistent_notifications_.end()) {
     DCHECK(non_persistent_iter == non_persistent_notifications_.end());
 
     const PersistentNotification& notification = persistent_iter->second;
-    content::NotificationEventDispatcher::GetInstance()
-        ->DispatchNotificationClickEvent(
-            notification.browser_context, notification_id, notification.origin,
-            action_index, reply, base::Bind(&OnEventDispatchComplete));
+    NotificationEventDispatcher::GetInstance()->DispatchNotificationClickEvent(
+        notification.browser_context, notification_id, notification.origin,
+        action_index, reply, base::Bind(&OnEventDispatchComplete));
   } else if (non_persistent_iter != non_persistent_notifications_.end()) {
     DCHECK_EQ(action_index, -1) << "Action buttons are only supported for "
                                    "persistent notifications";
 
     non_persistent_iter->second->NotificationClick();
   }
 }
 
 void LayoutTestNotificationManager::SimulateClose(const std::string& title,
                                                   bool by_user) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   const auto notification_id_iter = notification_id_map_.find(title);
   if (notification_id_iter == notification_id_map_.end())
     return;
 
   const std::string& notification_id = notification_id_iter->second;
 
   const auto& persistent_iter = persistent_notifications_.find(notification_id);
   if (persistent_iter == persistent_notifications_.end())
     return;
 
   const PersistentNotification& notification = persistent_iter->second;
-  content::NotificationEventDispatcher::GetInstance()
-      ->DispatchNotificationCloseEvent(
-          notification.browser_context, notification_id, notification.origin,
-          by_user, base::Bind(&OnEventDispatchComplete));
+  NotificationEventDispatcher::GetInstance()->DispatchNotificationCloseEvent(
+      notification.browser_context, notification_id, notification.origin,
+      by_user, base::Bind(&OnEventDispatchComplete));
 }
 
 blink::mojom::PermissionStatus
 LayoutTestNotificationManager::CheckPermissionOnUIThread(
     BrowserContext* browser_context,
     const GURL& origin,
     int render_process_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return CheckPermission(origin);
 }
@@ skipping 35 matching lines @@
 LayoutTestNotificationManager::CheckPermission(const GURL& origin) {
   return LayoutTestContentBrowserClient::Get()
       ->GetLayoutTestBrowserContext()
       ->GetLayoutTestPermissionManager()
       ->GetPermissionStatus(PermissionType::NOTIFICATIONS,
                             origin,
                             origin);
 }
 
 }  // namespace content