Bug 1695263 - Import marionette from driver not harness, r=marionette-reviewers,whimboo

This avoids a lot of unnecessary extra work and dependencies.

Differential Revision: https://phabricator.services.mozilla.com/D106760

layout/tools/reftest/runreftest.py

@@ -46,7 +46,7 @@ from six.moves import range
 
 try:
     from marionette_driver.addons import Addons
-    from marionette_harness import Marionette
+    from marionette_driver.marionette import Marionette
 except ImportError as e:  # noqa
     # Defer ImportError until attempt to use Marionette.
     # Python 3 deletes the exception once the except block

testing/mochitest/runtests.py

@@ -59,7 +59,7 @@ from mozgeckoprofiler import symbolicate_profile_json, view_gecko_profile
 
 try:
     from marionette_driver.addons import Addons
-    from marionette_harness import Marionette
+    from marionette_driver.marionette import Marionette
 except ImportError as e:  # noqa
     # Defer ImportError until attempt to use Marionette
     def reraise(*args, **kwargs):