Add badge to web notifications.

content/child/notifications/pending_notifications_tracker_unittest.cc

 // Copyright 2016 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/child/notifications/pending_notifications_tracker.h"
 
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 19 matching lines @@
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationData.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationDelegate.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "url/gurl.h"
 
 namespace content {
 
 namespace {
 
 const char kBaseUrl[] = "http://test.com/";
+const char kIcon48x48[] = "48x48.png";
 const char kIcon100x100[] = "100x100.png";
 const char kIcon110x110[] = "110x110.png";
 const char kIcon120x120[] = "120x120.png";
 const char kIcon500x500[] = "500x500.png";
 
 class FakeNotificationDelegate : public blink::WebNotificationDelegate {
  public:
   void dispatchClickEvent() override {}
   void dispatchShowEvent() override {}
   void dispatchErrorEvent() override {}
@@ skipping 84 matching lines @@
   base::MessageLoop message_loop_;
   scoped_ptr<PendingNotificationsTracker> tracker_;
   std::vector<NotificationResources> resources_;
 
   DISALLOW_COPY_AND_ASSIGN(PendingNotificationsTrackerTest);
 };
 
 TEST_F(PendingNotificationsTrackerTest, OneNotificationMultipleResources) {
   blink::WebNotificationData notification_data;
   notification_data.icon = RegisterMockedURL(kIcon100x100);
+  notification_data.badge = RegisterMockedURL(kIcon48x48);
   notification_data.actions =
       blink::WebVector<blink::WebNotificationAction>(static_cast<size_t>(2));
   notification_data.actions[0].icon = RegisterMockedURL(kIcon110x110);
   notification_data.actions[1].icon = RegisterMockedURL(kIcon120x120);
 
   tracker()->FetchResources(
       notification_data, nullptr /* delegate */,
       base::Bind(&PendingNotificationsTrackerTest::DidFetchResources,
                  base::Unretained(this), 0 /* index */));
 
   ASSERT_EQ(1u, CountPendingNotifications());
   ASSERT_EQ(0u, CountResources());
 
   base::RunLoop().RunUntilIdle();
   UnitTestSupport()->serveAsynchronousMockedRequests();
 
   ASSERT_EQ(0u, CountPendingNotifications());
   ASSERT_EQ(1u, CountResources());
 
-  ASSERT_FALSE(GetResources(0u)->notification_icon.drawsNothing());
-  ASSERT_EQ(100, GetResources(0u)->notification_icon.width());
+  NotificationResources* resources = GetResources(0u);
 
-  ASSERT_EQ(2u, GetResources(0u)->action_icons.size());
-  ASSERT_FALSE(GetResources(0u)->action_icons[0].drawsNothing());
-  ASSERT_EQ(110, GetResources(0u)->action_icons[0].width());
-  ASSERT_FALSE(GetResources(0u)->action_icons[1].drawsNothing());
-  ASSERT_EQ(120, GetResources(0u)->action_icons[1].width());
+  ASSERT_FALSE(resources->notification_icon.drawsNothing());
+  ASSERT_EQ(100, resources->notification_icon.width());
+
+  ASSERT_FALSE(resources->badge.drawsNothing());
+  ASSERT_EQ(48, resources->badge.width());
+
+  ASSERT_EQ(2u, resources->action_icons.size());
+  ASSERT_FALSE(resources->action_icons[0].drawsNothing());
+  ASSERT_EQ(110, resources->action_icons[0].width());
+  ASSERT_FALSE(resources->action_icons[1].drawsNothing());
+  ASSERT_EQ(120, resources->action_icons[1].width());
 }
 
 TEST_F(PendingNotificationsTrackerTest, LargeIconsAreScaledDown) {
   blink::WebNotificationData notification_data;
   notification_data.icon = RegisterMockedURL(kIcon500x500);
+  notification_data.badge = notification_data.icon;
   notification_data.actions =
       blink::WebVector<blink::WebNotificationAction>(static_cast<size_t>(1));
   notification_data.actions[0].icon = notification_data.icon;
 
   tracker()->FetchResources(
       notification_data, nullptr /* delegate */,
       base::Bind(&PendingNotificationsTrackerTest::DidFetchResources,
                  base::Unretained(this), 0 /* index */));
 
   ASSERT_EQ(1u, CountPendingNotifications());
   ASSERT_EQ(0u, CountResources());
 
   base::RunLoop().RunUntilIdle();
   UnitTestSupport()->serveAsynchronousMockedRequests();
 
   ASSERT_EQ(0u, CountPendingNotifications());
   ASSERT_EQ(1u, CountResources());
 
-  ASSERT_FALSE(GetResources(0u)->notification_icon.drawsNothing());
+  NotificationResources* resources = GetResources(0u);
+
+  ASSERT_FALSE(resources->notification_icon.drawsNothing());
   ASSERT_EQ(kPlatformNotificationMaxIconSizePx,
-            GetResources(0u)->notification_icon.width());
+            resources->notification_icon.width());
   ASSERT_EQ(kPlatformNotificationMaxIconSizePx,
-            GetResources(0u)->notification_icon.height());
+            resources->notification_icon.height());
 
-  ASSERT_EQ(1u, GetResources(0u)->action_icons.size());
-  ASSERT_FALSE(GetResources(0u)->action_icons[0].drawsNothing());
+  ASSERT_FALSE(resources->badge.drawsNothing());
+  ASSERT_EQ(kPlatformNotificationMaxBadgeSizePx, resources->badge.width());
+  ASSERT_EQ(kPlatformNotificationMaxBadgeSizePx, resources->badge.height());
+
+  ASSERT_EQ(1u, resources->action_icons.size());
+  ASSERT_FALSE(resources->action_icons[0].drawsNothing());
   ASSERT_EQ(kPlatformNotificationMaxActionIconSizePx,
-            GetResources(0u)->action_icons[0].width());
+            resources->action_icons[0].width());
   ASSERT_EQ(kPlatformNotificationMaxActionIconSizePx,
-            GetResources(0u)->action_icons[0].height());
+            resources->action_icons[0].height());
 }
 
 TEST_F(PendingNotificationsTrackerTest, TwoNotifications) {
   blink::WebNotificationData notification_data;
   notification_data.icon = RegisterMockedURL(kIcon100x100);
 
   blink::WebNotificationData notification_data_2;
   notification_data_2.icon = RegisterMockedURL(kIcon110x110);
 
   tracker()->FetchResources(
@@ skipping 60 matching lines @@
 
   base::RunLoop().RunUntilIdle();
   tracker()->CancelResourceFetches(&delegate);
 
   ASSERT_EQ(0u, CountPendingNotifications());
   ASSERT_EQ(0u, CountDelegates());
   ASSERT_EQ(0u, CountResources());
 }
 
 }  // namespace content