Bug 1107336: Update b2g desktop ref test runner to use new Marionette Driver; r=ahal

--HG--
extra : rebase_source : a7d25f417045a2c382124c29b017f176d9ecf0f5

layout/tools/reftest/b2g_desktop.py

@@ -11,9 +11,11 @@ here = os.path.abspath(os.path.dirname(__file__))
 
 from runreftest import RefTest, ReftestOptions
 
-from marionette import Marionette, expected
+from marionette_driver import expected
-from marionette.wait import Wait
+from marionette_driver.by import By
-from marionette.by import By
+from marionette_driver.marionette import Marionette
+from marionette_driver.wait import Wait
+
 from mozprocess import ProcessHandler
 from mozrunner import FirefoxRunner
 import mozinfo