Plumb Blink notification actions to button UI on desktop

content/child/notifications/notification_data_conversions_unittest.cc

Index: content/child/notifications/notification_data_conversions_unittest.cc
diff --git a/content/child/notifications/notification_data_conversions_unittest.cc b/content/child/notifications/notification_data_conversions_unittest.cc
index c124e4f0e3e346ea2e9dd04d6fb278eff4ead57d..4663d94294e9514408eec0d74af178514bbdf8a4 100644
--- a/content/child/notifications/notification_data_conversions_unittest.cc
+++ b/content/child/notifications/notification_data_conversions_unittest.cc
@@ -23,6 +23,10 @@ const char kNotificationTag[] = "my_tag";
 const char kNotificationIconUrl[] = "https://example.com/icon.png";
 const int kNotificationVibrationPattern[] = { 100, 200, 300 };
 const unsigned char kNotificationData[] = { 0xdf, 0xff, 0x0, 0x0, 0xff, 0xdf };
+const char kAction1Name[] = "btn1";
+const char kAction1Title[] = "Button 1";
+const char kAction2Name[] = "btn2";
+const char kAction2Title[] = "Button 2";
 
 TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
   std::vector<int> vibration_pattern(
@@ -32,6 +36,12 @@ TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
   std::vector<char> developer_data(
       kNotificationData, kNotificationData + arraysize(kNotificationData));
 
+  blink::WebVector<blink::WebNotificationAction> web_actions(2);
+  web_actions[0].action = kAction1Name;

[Peter Beverloo, 2015/07/30 17:02:05]

Did you compile this? You're assigning a char* to a WebString, which is UTF-16.

[johnme, 2015/07/31 18:21:31]

Done.

+  web_actions[0].title = kAction1Title;
+  web_actions[1].action = kAction2Name;
+  web_actions[1].title = kAction2Title;
+
   blink::WebNotificationData web_data(
       blink::WebString::fromUTF8(kNotificationTitle),
       blink::WebNotificationData::DirectionLeftToRight,
@@ -41,7 +51,8 @@ TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
       blink::WebURL(GURL(kNotificationIconUrl)),
       blink::WebVector<int>(vibration_pattern),
       true /* silent */,
-      blink::WebVector<char>(developer_data));
+      blink::WebVector<char>(developer_data),
+      web_actions);
 
   PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
   EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title);
@@ -59,6 +70,11 @@ TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
   ASSERT_EQ(developer_data.size(), platform_data.data.size());
   for (size_t i = 0; i < developer_data.size(); ++i)
     EXPECT_EQ(developer_data[i], platform_data.data[i]);
+  ASSERT_EQ(web_actions.size(), platform_data.actions.size());
+  EXPECT_EQ(web_actions[0].action, platform_data.actions[0].action);
+  EXPECT_EQ(web_actions[0].title, platform_data.actions[0].title);
+  EXPECT_EQ(web_actions[1].action, platform_data.actions[1].action);
+  EXPECT_EQ(web_actions[1].title, platform_data.actions[1].title);
 }
 
 TEST(NotificationDataConversionsTest,
@@ -85,6 +101,12 @@ TEST(NotificationDataConversionsTest, ToWebNotificationData) {
   std::vector<char> developer_data(
       kNotificationData, kNotificationData + arraysize(kNotificationData));
 
+  std::vector<PlatformNotificationAction> actions(2);
+  actions[0].action = kAction1Name;
+  actions[0].title = kAction1Title;
+  actions[1].action = kAction2Name;
+  actions[1].title = kAction2Title;
+
   PlatformNotificationData platform_data;
   platform_data.title = base::ASCIIToUTF16(kNotificationTitle);
   platform_data.direction =
@@ -115,6 +137,12 @@ TEST(NotificationDataConversionsTest, ToWebNotificationData) {
   ASSERT_EQ(developer_data.size(), web_data.data.size());
   for (size_t i = 0; i < developer_data.size(); ++i)
     EXPECT_EQ(developer_data[i], web_data.data[i]);
+
+  ASSERT_EQ(actions.size(), web_data.actions.size());
+  EXPECT_EQ(actions[0].action, web_data.actions[0].action);
+  EXPECT_EQ(actions[0].title, web_data.actions[0].title);
+  EXPECT_EQ(actions[1].action, web_data.actions[1].action);
+  EXPECT_EQ(actions[1].title, web_data.actions[1].title);
 }
 
 TEST(NotificationDataConversionsTest, ToWebNotificationDataDirectionality) {