Update ChromeDriver to accept W3C format InitSession

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 159 matching lines @@
 }
 
 Status InitSessionHelper(const InitSessionParams& bound_params,
                          Session* session,
                          const base::DictionaryValue& params,
                          std::unique_ptr<base::Value>* value) {
   session->driver_log.reset(
       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)
       && desired_caps->GetBoolean("chromeOptions.w3c", &w3c_capability)
-      && w3c_capability)
+      && w3c_capability) {
+    // TODO(johnchen): Handle capabilities.firstMatch.
     session->w3c_compliant = true;
-  else if (!params.GetDictionary("desiredCapabilities", &desired_caps) &&
-     !params.GetDictionary("capabilities.desiredCapabilities", &desired_caps))
-    return Status(kUnknownError, "cannot find dict 'desiredCapabilities'");
+  } else if (params.GetDictionary("capabilities.desiredCapabilities",
+                                  &desired_caps)
+             && desired_caps->GetBoolean("chromeOptions.w3c", &w3c_capability)
+             && w3c_capability) {
+    // TODO(johnchen): Remove when clients stop using this.
+    session->w3c_compliant = true;
+  } else if (!params.GetDictionary("desiredCapabilities", &desired_caps)) {
+    return Status(kSessionNotCreatedException,
+                  "Missing or invalid capabilities");
+  }
 
   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;
@@ skipping 691 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);
 }