[Chromedriver] Chromedriver should handle unexpected alert automatically.

chrome/test/chromedriver/session_commands.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/session_commands.h"
 
 #include <list>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 86 matching lines @@
       device_manager(device_manager),
       port_server(port_server),
       port_manager(port_manager) {}
 
 InitSessionParams::InitSessionParams(const InitSessionParams& other) = default;
 
 InitSessionParams::~InitSessionParams() {}
 
 namespace {
 
-std::unique_ptr<base::DictionaryValue> CreateCapabilities(Chrome* chrome) {
+std::unique_ptr<base::DictionaryValue> CreateCapabilities(Session* session) {
   std::unique_ptr<base::DictionaryValue> caps(new base::DictionaryValue());
   caps->SetString("browserName", "chrome");
-  caps->SetString("version", chrome->GetBrowserInfo()->browser_version);
+  caps->SetString("version",
+                  session->chrome->GetBrowserInfo()->browser_version);
   caps->SetString("chrome.chromedriverVersion", kChromeDriverVersion);
-  caps->SetString("platform", chrome->GetOperatingSystemName());
-  caps->SetString("pageLoadStrategy", chrome->page_load_strategy());
+  caps->SetString("platform", session->chrome->GetOperatingSystemName());
+  caps->SetString("pageLoadStrategy", session->chrome->page_load_strategy());
   caps->SetBoolean("javascriptEnabled", true);
   caps->SetBoolean("takesScreenshot", true);
   caps->SetBoolean("takesHeapSnapshot", true);
   caps->SetBoolean("handlesAlerts", true);
   caps->SetBoolean("databaseEnabled", false);
   caps->SetBoolean("locationContextEnabled", true);
   caps->SetBoolean("mobileEmulationEnabled",
-                   chrome->IsMobileEmulationEnabled());
+                   session->chrome->IsMobileEmulationEnabled());
   caps->SetBoolean("applicationCacheEnabled", false);
   caps->SetBoolean("browserConnectionEnabled", false);
   caps->SetBoolean("cssSelectorsEnabled", true);
   caps->SetBoolean("webStorageEnabled", true);
   caps->SetBoolean("rotatable", false);
   caps->SetBoolean("acceptSslCerts", true);
   caps->SetBoolean("nativeEvents", true);
-  caps->SetBoolean("hasTouchScreen", chrome->HasTouchScreen());
+  caps->SetBoolean("hasTouchScreen", session->chrome->HasTouchScreen());
+  caps->SetString("unexpectedAlertBehaviour",
+                  session->unexpected_alert_behaviour);
 
   ChromeDesktopImpl* desktop = NULL;
-  Status status = chrome->GetAsDesktop(&desktop);
+  Status status = session->chrome->GetAsDesktop(&desktop);
   if (status.IsOk()) {
     caps->SetString("chrome.userDataDir",
                     desktop->command().GetSwitchValueNative("user-data-dir"));
     caps->SetBoolean("networkConnectionEnabled",
                      desktop->IsNetworkConnectionEnabled());
   }
 
   return caps;
 }
 
@@ skipping 37 matching lines @@
     session->w3c_compliant = true;
   else if (!params.GetDictionary("desiredCapabilities", &desired_caps) &&
      !params.GetDictionary("capabilities.desiredCapabilities", &desired_caps))
     return Status(kUnknownError, "cannot find dict 'desiredCapabilities'");
 
   Capabilities capabilities;
   Status status = capabilities.Parse(*desired_caps);
   if (status.IsError())
     return status;
 
+  desired_caps->GetString("unexpectedAlertBehaviour",
+                           &session->unexpected_alert_behaviour);
+
   Log::Level driver_level = Log::kWarning;
   if (capabilities.logging_prefs.count(WebDriverLog::kDriverType))
     driver_level = capabilities.logging_prefs[WebDriverLog::kDriverType];
   session->driver_log->set_min_level(driver_level);
 
   // Create Log's and DevToolsEventListener's for ones that are DevTools-based.
   // Session will own the Log's, Chrome will own the listeners.
   // Also create |CommandListener|s for the appropriate logs.
   ScopedVector<DevToolsEventListener> devtools_event_listeners;
   ScopedVector<CommandListener> command_listeners;
@@ skipping 18 matching lines @@
                         &session->chrome);
   if (status.IsError())
     return status;
 
   status = session->chrome->GetWebViewIdForFirstTab(&session->window);
   if (status.IsError())
     return status;
 
   session->detach = capabilities.detach;
   session->force_devtools_screenshot = capabilities.force_devtools_screenshot;
-  session->capabilities = CreateCapabilities(session->chrome.get());
+  session->capabilities = CreateCapabilities(session);
   value->reset(session->capabilities->DeepCopy());
   return CheckSessionCreated(session);
 }
 
 }  // namespace
 
 Status ExecuteInitSession(const InitSessionParams& bound_params,
                           Session* session,
                           const base::DictionaryValue& params,
                           std::unique_ptr<base::Value>* value) {
@@ skipping 637 matching lines @@
                                       std::unique_ptr<base::Value>* value) {
   WebView* web_view = nullptr;
   Status status = session->GetTargetWindow(&web_view);
   if (status.IsError())
     return status;
   status = web_view->DeleteScreenOrientation();
   if (status.IsError())
     return status;
   return Status(kOk);
 }