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/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 125 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();
+    size_t count = 0;
+#if defined(OS_ANDROID)
+    count = static_cast<StubNotificationPlatformBridge*>(
+                g_browser_process->notification_platform_bridge())
+                ->GetNotificationCount();
+#else
+    count =
+        static_cast<StubNotificationUIManager*>(
+            g_browser_process->notification_ui_manager())
+            ->GetAllIdsByProfile(NotificationUIManager::GetProfileID(profile_))
+            .size();
+#endif

[Peter Beverloo, 2017/03/15 18:07:50]

This'll break on Mac pretty soon.

What about:

    display_service()->GetDisplayed(base::Bind(
        &PlatformNotificationServiceTest::DidGetDisplayedNotifications,
        base::Unretained(this));
    base::RunLoop().RunUntilIdle();

    ASSERT_TRUE(displayed_notifications_);
    return displayed_notifications_.size();

With the following new method:

  void DidGetDisplayedNotifications(
      std::unique_ptr<std::set<std::string>> displayed_notifications,
      bool supports_synchronization) {
    displayed_notifications_ = std::move(displayed_notifications);
  }

And the following attribute:

  std::unique_ptr<std::set<std::string>> displayed_notifications_;

[Miguel Garcia, 2017/03/16 14:57:42]

It wont' break (since the stub does not have XPC).


On 2017/03/15 18:07:50, Peter Beverloo wrote:

+    return count;
   }
 
   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())
@@ skipping 251 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)