[chromedriver] Add page loading strategy to capabilities

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 79 matching lines @@
 InitSessionParams::~InitSessionParams() {}
 
 namespace {
 
 std::unique_ptr<base::DictionaryValue> CreateCapabilities(Chrome* chrome) {
   std::unique_ptr<base::DictionaryValue> caps(new base::DictionaryValue());
   caps->SetString("browserName", "chrome");
   caps->SetString("version", chrome->GetBrowserInfo()->browser_version);
   caps->SetString("chrome.chromedriverVersion", kChromeDriverVersion);
   caps->SetString("platform", chrome->GetOperatingSystemName());
+  caps->SetString("pageLoadingStrategy", chrome->GetPageLoadingStrategy());
   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());
   caps->SetBoolean("applicationCacheEnabled", false);
   caps->SetBoolean("browserConnectionEnabled", false);
@@ skipping 70 matching lines @@
   status = CreateLogs(capabilities,
                       session,
                       &session->devtools_logs,
                       &devtools_event_listeners,
                       &command_listeners);
   if (status.IsError())
     return status;
 
   // |session| will own the |CommandListener|s.
   session->command_listeners.swap(command_listeners);
-

[samuong, 2016/07/25 22:44:33]

nit: don't delete the blank line

[evajiang, 2016/07/28 17:15:04]

Done.

   status = LaunchChrome(bound_params.context_getter.get(),
                         bound_params.socket_factory,
                         bound_params.device_manager,
                         bound_params.port_server,
                         bound_params.port_manager,
                         capabilities,
                         &devtools_event_listeners,
                         &session->chrome);
   if (status.IsError())
     return status;
 
+  status = session->chrome->SetPageLoadingStrategy(capabilities.page_loading);
+  if (status.IsError())
+    return status;
+
   std::list<std::string> web_view_ids;
   status = session->chrome->GetWebViewIds(&web_view_ids);
   if (status.IsError() || web_view_ids.empty()) {
     return status.IsError() ? status :
         Status(kUnknownError, "unable to discover open window in chrome");
   }
 
   session->window = web_view_ids.front();
   session->detach = capabilities.detach;
   session->force_devtools_screenshot = capabilities.force_devtools_screenshot;
@@ skipping 582 matching lines @@
 
 Status ExecuteSetAutoReporting(Session* session,
                                const base::DictionaryValue& params,
                                std::unique_ptr<base::Value>* value) {
   bool enabled;
   if (!params.GetBoolean("enabled", &enabled))
     return Status(kUnknownError, "missing parameter 'enabled'");
   session->auto_reporting_enabled = enabled;
   return Status(kOk);
 }