Make GetDisplayedNotifications asynchronous.

chrome/browser/notifications/platform_notification_service_unittest.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 <stdint.h>
 
 #include <utility>
 
+#include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/notifications/message_center_display_service.h"
 #include "chrome/browser/notifications/notification_delegate.h"
 #include "chrome/browser/notifications/notification_display_service_factory.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/browser/notifications/platform_notification_service_impl.h"
@@ skipping 79 matching lines @@
         std::move(ui_manager));
     TestingBrowserProcess::GetGlobal()->SetNotificationPlatformBridge(
         std::move(notification_bridge));
   }
 
   void TearDown() override {
     profile_manager_.reset();
     TestingBrowserProcess::DeleteInstance();
   }
 
+  void DidGetDisplayedNotifications(
+      std::unique_ptr<std::set<std::string>> displayed_notifications,
+      bool supports_synchronization) const {
+    displayed_notifications_ = std::move(displayed_notifications);
+  }
+
  protected:
   // Displays a simple, fake notifications and returns a weak pointer to the
   // delegate receiving events for it (ownership is transferred to the service).
   MockDesktopNotificationDelegate* CreateSimplePageNotification() const {
     return CreateSimplePageNotificationWithCloseClosure(nullptr);
   }
 
   // Displays a simple, fake notification and returns a weak pointer to the
   // delegate receiving events for it (ownership is transferred to the service).
   // The close closure may be specified if so desired.
@@ skipping 16 matching lines @@
 
   // Returns the Platform Notification Service these unit tests are for.
   PlatformNotificationServiceImpl* service() const {
     return PlatformNotificationServiceImpl::GetInstance();
   }
 
   // Returns the Profile to be used for these tests.
   Profile* profile() const { return profile_; }
 
   size_t GetNotificationCount() const {
-    std::set<std::string> notifications;
-    EXPECT_TRUE(display_service()->GetDisplayed(&notifications));
-    return notifications.size();
+    display_service()->GetDisplayed(base::Bind(
+        &PlatformNotificationServiceTest::DidGetDisplayedNotifications,
+        base::Unretained(this)));
+    base::RunLoop().RunUntilIdle();
+
+    EXPECT_TRUE(displayed_notifications_.get());
+    return displayed_notifications_->size();
   }
 
   Notification GetDisplayedNotification() {
 #if defined(OS_ANDROID)
     return static_cast<StubNotificationPlatformBridge*>(
                g_browser_process->notification_platform_bridge())
         ->GetNotificationAt(profile_->GetPath().BaseName().value(), 0);
 #else
     return static_cast<StubNotificationUIManager*>(
                g_browser_process->notification_ui_manager())
         ->GetNotificationAt(0);
 #endif
   }
 
  private:
   NotificationDisplayService* display_service() const {
     return NotificationDisplayServiceFactory::GetForProfile(profile_);
   }
 
   std::unique_ptr<TestingProfileManager> profile_manager_;
   TestingProfile* profile_;
   content::TestBrowserThreadBundle thread_bundle_;
+  mutable std::unique_ptr<std::set<std::string>> displayed_notifications_;
 };
 
 TEST_F(PlatformNotificationServiceTest, DisplayPageDisplayedEvent) {
   auto* delegate = CreateSimplePageNotification();
 
   EXPECT_EQ(1u, GetNotificationCount());
   EXPECT_TRUE(delegate->displayed());
 }
 
 TEST_F(PlatformNotificationServiceTest, DisplayPageCloseClosure) {
@@ skipping 229 matching lines @@
       profile(),
       GURL() /* service_worker_scope */,
       GURL("chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"),
       notification_data, NotificationResources(),
       new MockNotificationDelegate("hello"));
   EXPECT_EQ("NotificationTest",
             base::UTF16ToUTF8(notification.context_message()));
 }
 
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)