Bug 1107336: Update layout tests to use new Marionette Driver; r=jgriffin

--HG--
extra : rebase_source : 1a84494081492b97fe7d4c8ebb0c130e1c59fb29

layout/base/tests/marionette/test_selectioncarets.py

@@ -3,12 +3,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from by import By
-from marionette import Actions
+from marionette_driver.by import By
+from marionette_driver.marionette import Actions
 from marionette_test import MarionetteTestCase
+from marionette_driver.selection import SelectionManager
+from marionette_driver.gestures import long_press_without_contextmenu
+
 from math import ceil, floor
-from selection import SelectionManager
-from gestures import long_press_without_contextmenu
 
 
 class SelectionCaretsTest(MarionetteTestCase):

layout/base/tests/marionette/test_selectioncarets_multiplerange.py

@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from by import By
-from marionette import Actions
+from marionette_driver.by import By
+from marionette_driver.marionette import Actions
 from marionette_test import MarionetteTestCase
-from selection import SelectionManager
-from gestures import long_press_without_contextmenu
+from marionette_driver.selection import SelectionManager
+from marionette_driver.gestures import long_press_without_contextmenu
 
 
 class SelectionCaretsMultipleRangeTest(MarionetteTestCase):

layout/base/tests/marionette/test_touchcaret.py

@@ -3,10 +3,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from by import By
-from marionette import Actions
+from marionette_driver.by import By
+from marionette_driver.marionette import Actions
+from marionette_driver.selection import SelectionManager
 from marionette_test import MarionetteTestCase
-from selection import SelectionManager
 
 
 class TouchCaretTest(MarionetteTestCase):