Add badge to web notifications.

chrome/browser/notifications/platform_notification_service_browsertest.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 <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 18 matching lines @@
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // -----------------------------------------------------------------------------
 
 // Dimensions of the icon.png resource in the notification test data directory.
 const int kIconWidth = 100;
 const int kIconHeight = 100;
 
+// The maximum width and height of badges. Oversized images are scaled down to
+// these values.
+const int kMaxBadgeSize = 96;
+
 const int kNotificationVibrationPattern[] = { 100, 200, 300 };
 const double kNotificationTimestamp = 621046800000.;
 
 class PlatformNotificationServiceBrowserTest : public InProcessBrowserTest {
  public:
   PlatformNotificationServiceBrowserTest();
   ~PlatformNotificationServiceBrowserTest() override {}
 
   // InProcessBrowserTest overrides.
   void SetUpCommandLine(base::CommandLine* command_line) override;
@@ skipping 50 matching lines @@
 }
 
 PlatformNotificationServiceBrowserTest::PlatformNotificationServiceBrowserTest()
     : server_root_(FILE_PATH_LITERAL("chrome/test/data")),
       // The test server has a base directory that doesn't exist in the
       // filesystem.
       test_page_url_(std::string("/") + kTestFileName) {}
 
 void PlatformNotificationServiceBrowserTest::SetUpCommandLine(
     base::CommandLine* command_line) {
+  command_line->AppendSwitch(switches::kEnableExperimentalWebPlatformFeatures);
   command_line->AppendSwitch(switches::kEnableNotificationActionIcons);
 
   InProcessBrowserTest::SetUpCommandLine(command_line);
 }
 
 void PlatformNotificationServiceBrowserTest::SetUp() {
   ui_manager_.reset(new StubNotificationUIManager);
   https_server_.reset(
       new net::EmbeddedTestServer(net::EmbeddedTestServer::TYPE_HTTPS));
   https_server_->ServeFilesFromSourceDirectory(server_root_);
@@ skipping 119 matching lines @@
   EXPECT_EQ("ok", script_result);
 
   ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
 
   // We don't use or check the notification's direction and language.
   const Notification& default_notification = ui_manager()->GetNotificationAt(0);
   EXPECT_EQ("Some title", base::UTF16ToUTF8(default_notification.title()));
   EXPECT_EQ("", base::UTF16ToUTF8(default_notification.message()));
   EXPECT_EQ("", default_notification.tag());
   EXPECT_TRUE(default_notification.icon().IsEmpty());
+  EXPECT_TRUE(default_notification.small_image().IsEmpty());
   EXPECT_FALSE(default_notification.renotify());
   EXPECT_FALSE(default_notification.silent());
   EXPECT_FALSE(default_notification.never_timeout());
   EXPECT_EQ(0u, default_notification.buttons().size());
 
   // Verifies that the notification's default timestamp is set in the last 30
   // seconds. This number has no significance, but it needs to be significantly
   // high to avoid flakiness in the test.
   EXPECT_NEAR(default_notification.timestamp().ToJsTime(),
               base::Time::Now().ToJsTime(), 30 * 1000);
 
   // Now, test the non-default values.
 
   ASSERT_TRUE(RunScript("DisplayPersistentAllOptionsNotification()",
                         &script_result));
   EXPECT_EQ("ok", script_result);
 
   ASSERT_EQ(2u, ui_manager()->GetNotificationCount());
 
   // We don't use or check the notification's direction and language.
   const Notification& all_options_notification =
       ui_manager()->GetNotificationAt(1);
   EXPECT_EQ("Title", base::UTF16ToUTF8(all_options_notification.title()));
   EXPECT_EQ("Contents", base::UTF16ToUTF8(all_options_notification.message()));
   EXPECT_EQ("replace-id", all_options_notification.tag());
   EXPECT_FALSE(all_options_notification.icon().IsEmpty());
   EXPECT_EQ(kIconWidth, all_options_notification.icon().Width());
   EXPECT_EQ(kIconHeight, all_options_notification.icon().Height());
+  EXPECT_FALSE(all_options_notification.small_image().IsEmpty());
+  EXPECT_EQ(kMaxBadgeSize, all_options_notification.small_image().Width());
+  EXPECT_EQ(kMaxBadgeSize, all_options_notification.small_image().Height());
   EXPECT_TRUE(all_options_notification.renotify());
   EXPECT_TRUE(all_options_notification.silent());
   EXPECT_TRUE(all_options_notification.never_timeout());
   EXPECT_DOUBLE_EQ(kNotificationTimestamp,
                    all_options_notification.timestamp().ToJsTime());
   EXPECT_EQ(1u, all_options_notification.buttons().size());
   EXPECT_EQ("actionTitle",
             base::UTF16ToUTF8(all_options_notification.buttons()[0].title));
   EXPECT_FALSE(all_options_notification.buttons()[0].icon.IsEmpty());
   EXPECT_EQ(kIconWidth, all_options_notification.buttons()[0].icon.Width());
@@ skipping 192 matching lines @@
   EXPECT_EQ("actionTitle2", base::UTF16ToUTF8(notification.buttons()[1].title));
 
   notification.delegate()->ButtonClick(0);
   ASSERT_TRUE(RunScript("GetMessageFromWorker()", &script_result));
   EXPECT_EQ("action_button_click actionId1", script_result);
 
   notification.delegate()->ButtonClick(1);
   ASSERT_TRUE(RunScript("GetMessageFromWorker()", &script_result));
   EXPECT_EQ("action_button_click actionId2", script_result);
 }