Enable testing NotificationEvent.action

Spec: https://github.com/whatwg/notifications/pull/48

Intent to implement:
https://groups.google.com/a/chromium.org/d/msg/blink-dev/6tlbJW0NjEA/LF0kPfJx7c0J

Part of a sequence of patches:
- https://codereview.chromium.org/1254423011 (blink)
- https://codereview.chromium.org/1263043002 (blink)
- https://codereview.chromium.org/1263043003 (blink)
- https://codereview.chromium.org/1268813007 (blink)
- https://codereview.chromium.org/1267673003 (chromium)
- https://codereview.chromium.org/1262893005 (blink)
- https://codereview.chromium.org/1269923003 (chromium)
- this patch (chromium)
- https://codereview.chromium.org/1264403002 (blink)

BUG=513671
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/1262893006

Cr-Commit-Position: refs/heads/master@{#342358}

components/html_viewer/web_test_delegate_impl.cc

@@ -178,7 +178,7 @@ void WebTestDelegateImpl::SetDatabaseQuota(int quota) {
 }
 
 void WebTestDelegateImpl::SimulateWebNotificationClick(
-    const std::string& title) {
+    const std::string& title, int action_index) {
   NOTIMPLEMENTED();
 }
 

components/html_viewer/web_test_delegate_impl.h

@@ -65,7 +65,8 @@ class WebTestDelegateImpl : public test_runner::WebTestDelegate {
   void EvaluateInWebInspector(long call_id, const std::string& script) override;
   void ClearAllDatabases() override;
   void SetDatabaseQuota(int quota) override;
-  void SimulateWebNotificationClick(const std::string& title) override;
+  void SimulateWebNotificationClick(const std::string& title,
+                                    int action_index) override;
   void SetDeviceScaleFactor(float factor) override;
   void SetDeviceColorProfile(const std::string& name) override;
   void SetBluetoothMockDataSet(const std::string& data_set) override;

components/test_runner/test_runner.cc

@@ -273,7 +273,7 @@ class TestRunnerBindings : public gin::Wrappable<TestRunnerBindings> {
                        v8::Local<v8::Function> callback);
   void SetPOSIXLocale(const std::string& locale);
   void SetMIDIAccessorResult(bool result);
-  void SimulateWebNotificationClick(const std::string& title);
+  void SimulateWebNotificationClick(gin::Arguments* args);
   void AddMockSpeechRecognitionResult(const std::string& transcript,
                                       double confidence);
   void SetMockSpeechRecognitionError(const std::string& error,
@@ -1343,10 +1343,16 @@ void TestRunnerBindings::SetMIDIAccessorResult(bool result) {
     runner_->SetMIDIAccessorResult(result);
 }
 
-void TestRunnerBindings::SimulateWebNotificationClick(
-    const std::string& title) {
-  if (runner_)
-    runner_->SimulateWebNotificationClick(title);
+void TestRunnerBindings::SimulateWebNotificationClick(gin::Arguments* args) {
+  if (!runner_)
+    return;
+  std::string title;
+  int action_index = -1;
+  if (args->GetNext(&title) &&
+      (args->PeekNext().IsEmpty() || args->GetNext(&action_index)))
+    runner_->SimulateWebNotificationClick(title, action_index);
+  else
+    args->ThrowError();
 }
 
 void TestRunnerBindings::AddMockSpeechRecognitionResult(
@@ -2854,8 +2860,9 @@ void TestRunner::SetMIDIAccessorResult(bool result) {
   midi_accessor_result_ = result;
 }
 
-void TestRunner::SimulateWebNotificationClick(const std::string& title) {
-  delegate_->SimulateWebNotificationClick(title);
+void TestRunner::SimulateWebNotificationClick(const std::string& title,
+                                              int action_index) {
+  delegate_->SimulateWebNotificationClick(title, action_index);
 }
 
 void TestRunner::AddMockSpeechRecognitionResult(const std::string& transcript,

components/test_runner/test_runner.h

@@ -560,7 +560,7 @@ class TestRunner : public WebTestRunner,
   void SetMIDIAccessorResult(bool result);
 
   // Simulates a click on a Web Notification.
-  void SimulateWebNotificationClick(const std::string& title);
+  void SimulateWebNotificationClick(const std::string& title, int action_index);
 
   // Speech recognition related functions.
   void AddMockSpeechRecognitionResult(const std::string& transcript,

components/test_runner/web_test_delegate.h

@@ -149,7 +149,8 @@ class WebTestDelegate {
   virtual void SetDatabaseQuota(int quota) = 0;
 
   // Controls Web Notifications.
-  virtual void SimulateWebNotificationClick(const std::string& title) = 0;
+  virtual void SimulateWebNotificationClick(const std::string& title,
+                                            int action_index) = 0;
 
   // Controls the device scale factor of the main WebView for hidpi tests.
   virtual void SetDeviceScaleFactor(float factor) = 0;

content/shell/browser/layout_test/layout_test_message_filter.cc

@@ -112,11 +112,11 @@ void LayoutTestMessageFilter::OnSetDatabaseQuota(int quota) {
 }
 
 void LayoutTestMessageFilter::OnSimulateWebNotificationClick(
-    const std::string& title) {
+    const std::string& title, int action_index) {
   LayoutTestNotificationManager* manager =
       LayoutTestContentBrowserClient::Get()->GetLayoutTestNotificationManager();
   if (manager)
-    manager->SimulateClick(title);
+    manager->SimulateClick(title, action_index);
 }
 
 void LayoutTestMessageFilter::OnAcceptAllCookies(bool accept) {

content/shell/browser/layout_test/layout_test_message_filter.h

@@ -54,7 +54,8 @@ class LayoutTestMessageFilter : public BrowserMessageFilter {
   void OnGrantWebNotificationPermission(const GURL& origin,
                                         bool permission_granted);
   void OnClearWebNotificationPermissions();
-  void OnSimulateWebNotificationClick(const std::string& title);
+  void OnSimulateWebNotificationClick(const std::string& title,
+                                      int action_index);
   void OnSetPushMessagingPermission(const GURL& origin, bool allowed);
   void OnClearPushMessagingPermissions();
   void OnAcceptAllCookies(bool accept);

content/shell/browser/layout_test/layout_test_notification_manager.cc

@@ -106,12 +106,14 @@ bool LayoutTestNotificationManager::GetDisplayedPersistentNotifications(
   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()) {
+    // TODO(johnme): Pass action_index once it's supported.
     page_iterator->second->NotificationClick();
     return;
   }
@@ -127,7 +129,7 @@ void LayoutTestNotificationManager::SimulateClick(const std::string& title) {
           notification.browser_context,
           notification.persistent_id,
           notification.origin,
-          -1 /* action_index */,
+          action_index,
           base::Bind(&OnEventDispatchComplete));
 }
 

content/shell/browser/layout_test/layout_test_notification_manager.h

@@ -27,9 +27,10 @@ class LayoutTestNotificationManager : public PlatformNotificationService {
   LayoutTestNotificationManager();
   ~LayoutTestNotificationManager() override;
 
-  // Simulates a click on the notification titled |title|. Must be called on the
-  // UI thread.
-  void SimulateClick(const std::string& title);
+  // Simulates a click on the notification titled |title|. |action_index|
+  // indicates which action was clicked, or -1 if the main notification body was
+  // clicked. Must be called on the UI thread.
+  void SimulateClick(const std::string& title, int action_index);
 
   // PlatformNotificationService implementation.
   blink::WebNotificationPermission CheckPermissionOnUIThread(

content/shell/common/layout_test/layout_test_messages.h

@@ -27,8 +27,9 @@ IPC_SYNC_MESSAGE_ROUTED1_1(LayoutTestHostMsg_RegisterIsolatedFileSystem,
 IPC_MESSAGE_ROUTED0(LayoutTestHostMsg_ClearAllDatabases)
 IPC_MESSAGE_ROUTED1(LayoutTestHostMsg_SetDatabaseQuota,
                     int /* quota */)
-IPC_MESSAGE_ROUTED1(LayoutTestHostMsg_SimulateWebNotificationClick,
-                    std::string /* title */)
+IPC_MESSAGE_ROUTED2(LayoutTestHostMsg_SimulateWebNotificationClick,
+                    std::string /* title */,
+                    int /* action_index */)
 IPC_MESSAGE_ROUTED1(LayoutTestHostMsg_AcceptAllCookies,
                     bool /* accept */)
 IPC_MESSAGE_ROUTED0(LayoutTestHostMsg_DeleteAllCookies)

content/shell/renderer/layout_test/blink_test_runner.cc

@@ -459,8 +459,10 @@ void BlinkTestRunner::SetDatabaseQuota(int quota) {
   Send(new LayoutTestHostMsg_SetDatabaseQuota(routing_id(), quota));
 }
 
-void BlinkTestRunner::SimulateWebNotificationClick(const std::string& title) {
-  Send(new LayoutTestHostMsg_SimulateWebNotificationClick(routing_id(), title));
+void BlinkTestRunner::SimulateWebNotificationClick(const std::string& title,
+                                                   int action_index) {
+  Send(new LayoutTestHostMsg_SimulateWebNotificationClick(routing_id(), title,
+                                                          action_index));
 }
 
 void BlinkTestRunner::SetDeviceScaleFactor(float factor) {

content/shell/renderer/layout_test/blink_test_runner.h

@@ -91,7 +91,8 @@ class BlinkTestRunner : public RenderViewObserver,
   void EvaluateInWebInspector(long call_id, const std::string& script) override;
   void ClearAllDatabases() override;
   void SetDatabaseQuota(int quota) override;
-  void SimulateWebNotificationClick(const std::string& title) override;
+  void SimulateWebNotificationClick(const std::string& title,
+                                    int action_index) override;
   void SetDeviceScaleFactor(float factor) override;
   void SetDeviceColorProfile(const std::string& name) override;
   void SetBluetoothMockDataSet(const std::string& name) override;