[chromedriver] Accept loadAsync as a non-op chromeOption.

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"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
+#include "chrome/test/chromedriver/chrome/log.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 
 namespace {
 
 typedef base::Callback<Status(const base::Value&, Capabilities*)> Parser;
 
 Status ParseDetach(
     const base::Value& option,
     Capabilities* capabilities) {
   if (!option.GetAsBoolean(&capabilities->detach))
     return Status(kUnknownError, "'detach' must be a boolean");
   return Status(kOk);
 }
 
+Status IgnoreDeprecatedOption(
+    Log* log,
+    const char* option_name,
+    const base::Value& option,
+    Capabilities* capabilities) {
+  log->AddEntry(Log::kWarning,
+                base::StringPrintf("deprecated chrome option is ignored: '%s'",
+                                   option_name));
+  return Status(kOk);
+}
+
 Status ParseChromeBinary(
     const base::Value& option,
     Capabilities* capabilities) {
   base::FilePath::StringType path_str;
   if (!option.GetAsString(&path_str))
     return Status(kUnknownError, "'binary' must be a string");
   base::FilePath chrome_exe(path_str);
   capabilities->command.SetProgram(chrome_exe);
   return Status(kOk);
 }
@@ skipping 126 matching lines @@
       capabilities->command.AppendSwitchASCII("proxy-bypass-list",
                                               proxy_bypass_list);
     }
   } else {
     return Status(kUnknownError, "unrecognized proxy type:" + proxy_type);
   }
   return Status(kOk);
 }
 
 Status ParseDesktopChromeCapabilities(
+    Log* log,
     const base::Value& capability,
     Capabilities* capabilities) {
   const base::DictionaryValue* chrome_options = NULL;
   if (!capability.GetAsDictionary(&chrome_options))
     return Status(kUnknownError, "'chromeOptions' must be a dictionary");
 
   std::map<std::string, Parser> parser_map;
 
   parser_map["detach"] = base::Bind(&ParseDetach);
+  parser_map["loadAsync"] =
+      base::Bind(&IgnoreDeprecatedOption, log, "loadAsync");
   parser_map["binary"] = base::Bind(&ParseChromeBinary);
   parser_map["logPath"] = base::Bind(&ParseLogPath);
   parser_map["args"] = base::Bind(&ParseArgs, false);
   parser_map["prefs"] = base::Bind(&ParsePrefs);
   parser_map["localState"] = base::Bind(&ParseLocalState);
   parser_map["extensions"] = base::Bind(&ParseExtensions);
 
   for (base::DictionaryValue::Iterator it(*chrome_options); !it.IsAtEnd();
        it.Advance()) {
     if (parser_map.find(it.key()) == parser_map.end()) {
@@ skipping 84 matching lines @@
 Capabilities::Capabilities()
     : detach(false),
       command(CommandLine::NO_PROGRAM) {}
 
 Capabilities::~Capabilities() {}
 
 bool Capabilities::IsAndroid() const {
   return !android_package.empty();
 }
 
-Status Capabilities::Parse(const base::DictionaryValue& desired_caps) {
+Status Capabilities::Parse(
+    const base::DictionaryValue& desired_caps,
+    Log* log) {
   Status status = ParseLoggingPrefs(desired_caps, this);
   if (status.IsError())
     return status;
   status = ParseAndroidChromeCapabilities(desired_caps, this);
   if (status.IsError())
     return status;
   if (IsAndroid())
     return Status(kOk);
 
   std::map<std::string, Parser> parser_map;
   parser_map["proxy"] = base::Bind(&ParseProxy);
-  parser_map["chromeOptions"] = base::Bind(&ParseDesktopChromeCapabilities);
+  parser_map["chromeOptions"] =
+      base::Bind(&ParseDesktopChromeCapabilities, log);
   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)) {
       status = it->second.Run(*capability, this);
       if (status.IsError())
         return status;
     }
   }
   return Status(kOk);
 }