Update ChromeDriver to accept W3C format InitSession

chrome/test/chromedriver/client/chromedriver.py

 # Copyright 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.
 
 import platform
 import sys
 import util
 
 import command_executor
 from command_executor import Command
@@ skipping 95 matching lines @@
 class ChromeDriver(object):
   """Starts and controls a single Chrome instance on this machine."""
 
   def __init__(self, server_url, chrome_binary=None, android_package=None,
                android_activity=None, android_process=None,
                android_use_running_app=None, chrome_switches=None,
                chrome_extensions=None, chrome_log_path=None,
                debugger_address=None, logging_prefs=None,
                mobile_emulation=None, experimental_options=None,
                download_dir=None, network_connection=None,
-               send_w3c_capability=None, send_w3c_request=None,
+               send_w3c_request=None,
                page_load_strategy=None, unexpected_alert_behaviour=None):
     self._executor = command_executor.CommandExecutor(server_url)
 
     options = {}
 
     if experimental_options:
       assert isinstance(experimental_options, dict)
       options = experimental_options.copy()
 
     if android_package:
@@ skipping 46 matching lines @@
       logging_prefs = {}
 
     download_prefs = {}
     if download_dir:
       if 'prefs' not in options:
         options['prefs'] = {}
       if 'download' not in options['prefs']:
         options['prefs']['download'] = {}
       options['prefs']['download']['default_directory'] = download_dir
 
-    if send_w3c_capability:
-      options['w3c'] = send_w3c_capability
-
     params = {
-      'desiredCapabilities': {
         'chromeOptions': options,
         'loggingPrefs': logging_prefs
-      }
     }
 
     if page_load_strategy:
       assert type(page_load_strategy) is str
-      params['desiredCapabilities']['pageLoadStrategy'] = page_load_strategy
+      params['pageLoadStrategy'] = page_load_strategy
 
     if unexpected_alert_behaviour:
       assert type(unexpected_alert_behaviour) is str
-      params['desiredCapabilities']['unexpectedAlertBehaviour'] = (
-          unexpected_alert_behaviour)
+      params['unexpectedAlertBehaviour'] = unexpected_alert_behaviour
 
     if network_connection:
-      params['desiredCapabilities']['networkConnectionEnabled'] = (
-          network_connection)
+      params['networkConnectionEnabled'] = network_connection
 
     if send_w3c_request:
-      params = {'capabilities': params}
+      params = {'capabilities': {'alwaysMatch': params}}
+    else:
+      params = {'desiredCapabilities': params}
 
     response = self._ExecuteCommand(Command.NEW_SESSION, params)
     if isinstance(response['status'], basestring):
       self.w3c_compliant = True
     elif isinstance(response['status'], int):
       self.w3c_compliant = False
     else:
       raise UnknownError("unexpected response")
 
     self._session_id = response['sessionId']
@@ skipping 293 matching lines @@
     self.ExecuteCommand(Command.DELETE_SCREEN_ORIENTATION)
 
   def SendKeys(self, *values):
     typing = []
     for value in values:
       if isinstance(value, int):
         value = str(value)
       for i in range(len(value)):
         typing.append(value[i])
     self.ExecuteCommand(Command.SEND_KEYS_TO_ACTIVE_ELEMENT, {'value': typing})