Update timeout methods to work with W3C dialect of JSON Protocol

Author: AutomatedTester

Diff for: py/selenium/webdriver/remote/webdriver.py

@@ -641,7 +641,11 @@ def implicitly_wait(self, time_to_wait):
         :Usage:
             driver.implicitly_wait(30)
         """
-        self.execute(Command.IMPLICIT_WAIT, {'ms': float(time_to_wait) * 1000})
+        if self.capabilities["marionette"] == True:
+            self.execute(Command.SET_TIMEOUTS,
+                         {'ms': float(time_to_wait) * 1000, 'type':'implicit'})
+        else:
+            self.execute(Command.IMPLICIT_WAIT, {'ms': float(time_to_wait) * 1000})
 
     def set_script_timeout(self, time_to_wait):
         """
@@ -654,8 +658,12 @@ def set_script_timeout(self, time_to_wait):
         :Usage:
             driver.set_script_timeout(30)
         """
-        self.execute(Command.SET_SCRIPT_TIMEOUT,
-            {'ms': float(time_to_wait) * 1000})
+        if self.capabilities["marionette"] == True:
+            self.execute(Command.SET_TIMEOUTS,
+                         {'ms': float(time_to_wait) * 1000, 'type':'script'})
+        else:
+            self.execute(Command.SET_SCRIPT_TIMEOUT,
+                         {'ms': float(time_to_wait) * 1000})
 
     def set_page_load_timeout(self, time_to_wait):
         """