Update ChromeDriver to accept W3C format InitSession

chrome/test/chromedriver/session_commands.cc

Index: chrome/test/chromedriver/session_commands.cc
diff --git a/chrome/test/chromedriver/session_commands.cc b/chrome/test/chromedriver/session_commands.cc
index 1a39f53bc3a0574e07e8fb9e9ea019677c0ae3ee..9e7e751a85bb8b8fcbf309efc15b5e7c56f5f054 100644
--- a/chrome/test/chromedriver/session_commands.cc
+++ b/chrome/test/chromedriver/session_commands.cc
@@ -177,13 +177,17 @@ Status InitSessionHelper(const InitSessionParams& bound_params,
       new WebDriverLog(WebDriverLog::kDriverType, Log::kAll));
   const base::DictionaryValue* desired_caps;
   bool w3c_capability = false;
-  if (params.GetDictionary("capabilities.desiredCapabilities", &desired_caps)
+  if ((params.GetDictionary("capabilities.alwaysMatch", &desired_caps) ||
+       params.GetDictionary("capabilities.desiredCapabilities", &desired_caps))
       && desired_caps->GetBoolean("chromeOptions.w3c", &w3c_capability)
       && w3c_capability)
+    // TBD: Handle capabilities.firstMatch.

[samuong, 2017/03/28 23:02:48]

s/TBD/TODO(johnchen)/

     session->w3c_compliant = true;
   else if (!params.GetDictionary("desiredCapabilities", &desired_caps) &&
+     !params.GetDictionary("capabilities.alwaysMatch", &desired_caps) &&
      !params.GetDictionary("capabilities.desiredCapabilities", &desired_caps))

[samuong, 2017/03/28 23:02:48]

I think these last two checks are redundant, since we already checked for
alwaysMatch and desiredCapabilities in the first if?

-    return Status(kUnknownError, "cannot find dict 'desiredCapabilities'");
+    return Status(kUnknownError,
+                  "cannot find dict 'alwaysMatch' or 'desiredCapabilities'");
 
   Capabilities capabilities;
   Status status = capabilities.Parse(*desired_caps);