Plumb Blink notification actions to button UI on desktop

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 "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/browser/notifications/platform_notification_service_impl.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 169 matching lines @@
 TEST_F(PlatformNotificationServiceTest, DisplayPageNotificationMatches) {
   std::vector<int> vibration_pattern(
       kNotificationVibrationPattern,
       kNotificationVibrationPattern + arraysize(kNotificationVibrationPattern));
 
   content::PlatformNotificationData notification_data;
   notification_data.title = base::ASCIIToUTF16("My notification's title");
   notification_data.body = base::ASCIIToUTF16("Hello, world!");
   notification_data.vibration_pattern = vibration_pattern;
   notification_data.silent = true;
+  notification_data.actions.resize(2);
+  notification_data.actions[0].title = "Button 1";
+  notification_data.actions[1].title = "Button 2";
 
   MockDesktopNotificationDelegate* delegate
       = new MockDesktopNotificationDelegate();
   service()->DisplayNotification(profile(),
                                  GURL("https://chrome.com/"),
                                  SkBitmap(),
                                  notification_data,
                                  make_scoped_ptr(delegate),
                                  nullptr);
 
   ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
 
   const Notification& notification = ui_manager()->GetNotificationAt(0);
   EXPECT_EQ("https://chrome.com/", notification.origin_url().spec());
   EXPECT_EQ("My notification's title",
       base::UTF16ToUTF8(notification.title()));
   EXPECT_EQ("Hello, world!",
       base::UTF16ToUTF8(notification.message()));
 
   EXPECT_THAT(notification.vibration_pattern(),
       testing::ElementsAreArray(kNotificationVibrationPattern));
 
   EXPECT_TRUE(notification.silent());
+
+  ASSERT_EQ(2, notification.buttons().size());
+  EXPECT_EQ("Button 1", base::UTF16ToUTF8(notification.buttons()[0].title));

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

Could we cache a reference to notification.buttons() to avoid needing the "()[]"
stuff? We're using it three times anyway.

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

Done (const auto& buttons)

+  EXPECT_EQ("Button 2", base::UTF16ToUTF8(notification.buttons()[1].title));
 }
 
 TEST_F(PlatformNotificationServiceTest, DisplayNameForOrigin) {
   base::string16 display_name =
       service()->DisplayNameForOrigin(profile(), GURL("https://chrome.com/"));
 
   EXPECT_EQ(base::ASCIIToUTF16("chrome.com"), display_name);
 
   // TODO(peter): Include unit tests for the extension-name translation
   // functionality of DisplayNameForOriginInProcessId.
@@ skipping 116 matching lines @@
   // Verify that the service indicates that permission has been granted. We only
   // check the UI thread-method for now, as that's the one guarding the behavior
   // in the browser process.
   EXPECT_EQ(blink::WebNotificationPermissionAllowed,
             service()->CheckPermissionOnUIThread(profile(),
                                                  extension->url(),
                                                  kFakeRenderProcessId));
 }
 
 #endif  // defined(ENABLE_EXTENSIONS)