Bug 1107706: Part 15: Fix emulator callbacks for content process

--HG--
extra : rebase_source : 685c4d6710f8287ba82b902f3779401dc5dc08ec
extra : source : 3c25064e24da9f96ee02e71dfc1c9bde4c6dec38

testing/marionette/simpletest.js

@@ -37,6 +37,8 @@ Marionette.prototype = {
     "getLogs",
     "generate_results",
     "waitFor",
+    "runEmulatorCmd",
+    "runEmulatorShell",
     "TEST_PASS",
     "TEST_KNOWN_FAIL",
     "TEST_UNEXPECTED_FAIL",
@@ -201,4 +203,14 @@ Marionette.prototype = {
       }
       this.window.setTimeout(this.waitFor.bind(this), 100, callback, test, deadline);
   },
+
+  runEmulatorCmd: function runEmulatorCmd(cmd, callback) {
+    this.heartbeatCallback();
+    this.scope.runEmulatorCmd(cmd, callback);
+  },
+
+  runEmulatorShell: function runEmulatorShell(args, callback) {
+    this.heartbeatCallback();
+    this.scope.runEmulatorShell(args, callback);
+  },
 };