Enable testing NotificationEvent.action

content/shell/browser/layout_test/layout_test_notification_manager.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 "content/shell/browser/layout_test/layout_test_notification_manager.h"
 
 #include "base/guid.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
@@ skipping 88 matching lines @@
 
 bool LayoutTestNotificationManager::GetDisplayedPersistentNotifications(
     BrowserContext* browser_context,
     std::set<std::string>* displayed_notifications) {
   DCHECK(displayed_notifications);
 
   // Notifications will never outlive the lifetime of running layout tests.
   return false;
 }
 
-void LayoutTestNotificationManager::SimulateClick(const std::string& title) {
+void LayoutTestNotificationManager::SimulateClick(const std::string& title,
+                                                  int action_index) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // First check for page-notifications with the given title.
   const auto& page_iterator = page_notifications_.find(title);
   if (page_iterator != page_notifications_.end()) {
+    CHECK(action_index < 0) << "Simulating action clicks for page notifications"

[Peter Beverloo, 2015/08/04 21:08:33]

Please make sure there's a TODO + a bug for this.

[johnme, 2015/08/05 13:51:27]

Added a TODO. Plumbing action clicks to page notifications is a core part of
issue 513671 though (and this is how it'll be tested), so no need for an
additional bug.

+                            << " is not yet implemented";
     page_iterator->second->NotificationClick();
     return;
   }
 
   // Then check for persistent notifications with the given title.
   const auto& persistent_iterator = persistent_notifications_.find(title);
   if (persistent_iterator == persistent_notifications_.end())
     return;
 
   const PersistentNotification& notification = persistent_iterator->second;
   content::NotificationEventDispatcher::GetInstance()
       ->DispatchNotificationClickEvent(
           notification.browser_context,
           notification.persistent_id,
           notification.origin,
-          -1 /* action_index */,
+          action_index,
           base::Bind(&OnEventDispatchComplete));
 }
 
 blink::WebNotificationPermission
 LayoutTestNotificationManager::CheckPermissionOnUIThread(
     BrowserContext* browser_context,
     const GURL& origin,
     int render_process_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return CheckPermission(origin);
@@ skipping 52 matching lines @@
 LayoutTestNotificationManager::CheckPermission(const GURL& origin) {
   return ToWebNotificationPermission(LayoutTestContentBrowserClient::Get()
       ->GetLayoutTestBrowserContext()
       ->GetLayoutTestPermissionManager()
       ->GetPermissionStatus(PermissionType::NOTIFICATIONS,
                             origin,
                             origin));
 }
 
 }  // namespace content