Enable testing NotificationEvent.action

components/test_runner/test_runner.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 "components/test_runner/test_runner.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "components/test_runner/mock_credential_manager_client.h"
@@ skipping 255 matching lines @@
   void ClearAllDatabases();
   void SetDatabaseQuota(int quota);
   void SetAlwaysAcceptCookies(bool accept);
   void SetWindowIsKey(bool value);
   std::string PathToLocalResource(const std::string& path);
   void SetBackingScaleFactor(double value, v8::Local<v8::Function> callback);
   void SetColorProfile(const std::string& name,
                        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,
                                      const std::string& message);
   bool WasMockSpeechRecognitionAborted();
   void AddMockCredentialManagerResponse(const std::string& id,
                                         const std::string& name,
                                         const std::string& avatar,
                                         const std::string& password);
   void AddWebPageOverlay();
@@ skipping 1049 matching lines @@
 void TestRunnerBindings::SetPOSIXLocale(const std::string& locale) {
   if (runner_)
     runner_->SetPOSIXLocale(locale);
 }
 
 void TestRunnerBindings::SetMIDIAccessorResult(bool result) {
   if (runner_)
     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)) {

[Peter Beverloo, 2015/08/07 00:11:28]

nit: you could rewrite this statement to be easier to read (negations don't help
- hi TotT!)

==========
if (args->GetNext(&title) &&
    (args->PeekNext().IsEmpty() || args->GetNext(&action_index)))
  runner_->Simultate..

args->ThrowError();
==========

You should consider simply making it required in the call to
SimultateWebNotificationClick, i.e. have this code now, then update all the
tests, then change this away from using gin::Arguments* again.

[johnme, 2015/08/07 07:09:54]

Done.
Acknowledged.

+    args->ThrowError();
+    return;
+  }
+  runner_->SimulateWebNotificationClick(title, action_index);
 }
 
 void TestRunnerBindings::AddMockSpeechRecognitionResult(
     const std::string& transcript, double confidence) {
   if (runner_)
     runner_->AddMockSpeechRecognitionResult(transcript, confidence);
 }
 
 void TestRunnerBindings::SetMockSpeechRecognitionError(
     const std::string& error, const std::string& message) {
@@ skipping 1487 matching lines @@
 }
 
 void TestRunner::SetPOSIXLocale(const std::string& locale) {
   delegate_->SetLocale(locale);
 }
 
 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,
                                                 double confidence) {
   proxy_->GetSpeechRecognizerMock()->AddMockResult(
       WebString::fromUTF8(transcript), confidence);
 }
 
 void TestRunner::SetMockSpeechRecognitionError(const std::string& error,
                                                const std::string& message) {
@@ skipping 192 matching lines @@
 }
 
 void TestRunner::DidLosePointerLockInternal() {
   bool was_locked = pointer_locked_;
   pointer_locked_ = false;
   if (was_locked)
     web_view_->didLosePointerLock();
 }
 
 }  // namespace test_runner