[chromedriver] Add page loading strategy to capabilities

chrome/test/chromedriver/capabilities.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/capabilities.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 569 matching lines @@
       timeline(InspectorDomainStatus::kDefaultDisabled),
       trace_categories(),
       buffer_usage_reporting_interval(1000) {}
 
 PerfLoggingPrefs::~PerfLoggingPrefs() {}
 
 Capabilities::Capabilities()
     : android_use_running_app(false),
       detach(false),
       force_devtools_screenshot(false),
+      page_loading("normal"),

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

normal, eager and none should be defined constants somewhere

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

Done.

       network_emulation_enabled(false) {}
 
 Capabilities::~Capabilities() {}
 
 bool Capabilities::IsAndroid() const {
   return !android_package.empty();
 }
 
 bool Capabilities::IsRemoteBrowser() const {
   return debugger_address.IsValid();
 }
 
 Status Capabilities::Parse(const base::DictionaryValue& desired_caps) {
   std::map<std::string, Parser> parser_map;
   parser_map["chromeOptions"] = base::Bind(&ParseChromeOptions);
   parser_map["loggingPrefs"] = base::Bind(&ParseLoggingPrefs);
   parser_map["proxy"] = base::Bind(&ParseProxy);
+  parser_map["pageLoadingStrategy"] = base::Bind(&ParseString, &page_loading);

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

this should be called "pageLoadStrategy" (see
https://w3c.github.io/webdriver/webdriver-spec.html#capabilities)

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

Done.

   // Network emulation requires device mode, which is only enabled when
   // mobile emulation is on.
   if (desired_caps.GetDictionary("chromeOptions.mobileEmulation", nullptr)) {
     parser_map["networkConnectionEnabled"] =
         base::Bind(&ParseBoolean, &network_emulation_enabled);
   }
   for (std::map<std::string, Parser>::iterator it = parser_map.begin();
        it != parser_map.end(); ++it) {
     const base::Value* capability = NULL;
     if (desired_caps.Get(it->first, &capability)) {
@@ skipping 10 matching lines @@
   if (iter == logging_prefs.end() || iter->second == Log::kOff) {
     const base::DictionaryValue* chrome_options = NULL;
     if (desired_caps.GetDictionary("chromeOptions", &chrome_options) &&
         chrome_options->HasKey("perfLoggingPrefs")) {
       return Status(kUnknownError, "perfLoggingPrefs specified, "
                     "but performance logging was not enabled");
     }
   }
   return Status(kOk);
 }