Update ChromeDriver to accept W3C format InitSession

chrome/test/chromedriver/client/chromedriver.py

Index: chrome/test/chromedriver/client/chromedriver.py
diff --git a/chrome/test/chromedriver/client/chromedriver.py b/chrome/test/chromedriver/client/chromedriver.py
index 3ef916190ba0962dcd180bf40d0b18a0f61781d9..53e40cffca17e807515fb5ff2853751461f455e1 100644
--- a/chrome/test/chromedriver/client/chromedriver.py
+++ b/chrome/test/chromedriver/client/chromedriver.py
@@ -113,7 +113,7 @@ class ChromeDriver(object):
                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)
 
@@ -180,31 +180,26 @@ class ChromeDriver(object):
         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):