Revert "Issue %3015 - Part 3: Remove GMP code from addons, crash handler and tests."

This reverts commit 1699dbe78bf43eaa5ef4c593f075dfdc59c02b15.

2 files changed, 12 insertions, 0 deletions

diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index f52a83672..6763952af 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1499,6 +1499,14 @@ toolbar#nav-bar {
         if not self.disable_leak_checking:
             browserEnv["XPCOM_MEM_BLOAT_LOG"] = self.leak_report_file
 
+        try:
+            gmp_path = self.getGMPPluginPath(options)
+            if gmp_path is not None:
+                browserEnv["MOZ_GMP_PATH"] = gmp_path
+        except EnvironmentError:
+            self.log.error('Could not find path to gmp-fake plugin!')
+            return None
+
         if options.fatalAssertions:
             browserEnv["XPCOM_DEBUG_BREAK"] = "stack-and-abort"
 
diff --git a/testing/mochitest/runtestsremote.py b/testing/mochitest/runtestsremote.py
index a6f264a36..8010703e9 100644
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -256,6 +256,10 @@ class MochiRemote(MochitestDesktop):
         except mozdevice.DMError:
             self.log.warning("Error getting device information")
 
+    def getGMPPluginPath(self, options):
+        # TODO: bug 1149374
+        return None
+
     def buildBrowserEnv(self, options, debugger=False):
         browserEnv = MochitestDesktop.buildBrowserEnv(
             self,