[chromedriver] Retry alert handling if HandleJavaScriptDialog fails.

chrome/test/chromedriver/chrome/javascript_dialog_manager.cc

 // Copyright (c) 2013 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 "chrome/test/chromedriver/chrome/javascript_dialog_manager.h"
 
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome/devtools_client.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 
@@ skipping 19 matching lines @@
 Status JavaScriptDialogManager::HandleDialog(bool accept,
                                              const std::string* text) {
   if (!IsDialogOpen())
     return Status(kNoAlertOpen);
 
   base::DictionaryValue params;
   params.SetBoolean("accept", accept);
   if (text)
     params.SetString("promptText", *text);
   Status status = client_->SendCommand("Page.handleJavaScriptDialog", params);
+  std::string msg = status.message();
+  // Retry handling the alert dialog if
+  // JavaScriptDialogManager::HandleJavaScriptDialog function fails.

[samuong, 2016/11/16 19:06:05]

This comment doesn't add much, I don't think it's necessary

[gmanikpure, 2016/11/16 20:22:40]

ok.I will remove it.

+  if (status.IsError() && (msg.find("Could not handle JavaScript dialog") !=
+       std::string::npos)) {

[samuong, 2016/11/16 19:06:04]

This isn't a very specific error message (it gets sent back for any error that
Chrome's JavaScriptDialogManager::HandleJavaScriptDialog sends back) so there's
not much to be gained from checking this.

[gmanikpure, 2016/11/16 20:22:40]

Oh ok, the response received is :- "[38.955][DEBUG]: DEVTOOLS RESPONSE
Page.handleJavaScriptDialog (id=20) {"code":-32603,"message":"Could not handle
JavaScript dialog"}"

Shall i check the code '-32603' instead ?

[samuong, 2016/11/16 21:04:04]

You can just check "status.IsError()", this should be enough to determine
whether an error occurred or not.

[gmanikpure, 2016/11/16 21:26:45]

Done.Please take a look.

+      status = client_->SendCommand("Page.handleJavaScriptDialog", params);
+    }

[samuong, 2016/11/16 19:06:04]

nit: don't need braces for a single-line if body

[gmanikpure, 2016/11/16 20:22:40]

oops, sorry. I had some logging statements inside the if body for analysis
purpose and forgot to remove those braces.

   if (status.IsError())
     return status;
 
   // Remove a dialog from the queue. Need to check the queue is not empty here,
   // because it could have been cleared during waiting for the command
   // response.
   if (unhandled_dialog_queue_.size())
     unhandled_dialog_queue_.pop_front();
   return Status(kOk);
 }
@@ skipping 13 matching lines @@
       return Status(kUnknownError, "dialog event missing or invalid 'message'");
 
     unhandled_dialog_queue_.push_back(message);
   } else if (method == "Page.javascriptDialogClosed") {
     // Inspector only sends this event when all dialogs have been closed.
     // Clear the unhandled queue in case the user closed a dialog manually.
     unhandled_dialog_queue_.clear();
   }
   return Status(kOk);
 }