From 3f7b53a553bc1f0bc74adc0dd2a8b9c13bf458ab Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 13 Jan 2015 18:19:18 -0500
Subject: [PATCH] Bug 1110495 - Wrap try/catch around e10s add-on shim
 initialization. r=billm.

--HG--
extra : rebase_source : 43cee1df2bced048dc22be58a7f0a2ccb9dc92a5
---
 .../addoncompat/RemoteAddonsChild.jsm         | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/toolkit/components/addoncompat/RemoteAddonsChild.jsm b/toolkit/components/addoncompat/RemoteAddonsChild.jsm
index 41b8a9914e18..3623244017e9 100644
--- a/toolkit/components/addoncompat/RemoteAddonsChild.jsm
+++ b/toolkit/components/addoncompat/RemoteAddonsChild.jsm
@@ -496,11 +496,21 @@ let RemoteAddonsChild = {
   _ready: false,
 
   makeReady: function() {
-    Prefetcher.init();
-    NotificationTracker.init();
-    ContentPolicyChild.init();
-    AboutProtocolChild.init();
-    ObserverChild.init();
+    let shims = [
+      Prefetcher,
+      NotificationTracker,
+      ContentPolicyChild,
+      AboutProtocolChild,
+      ObserverChild,
+    ];
+
+    for (let shim of shims) {
+      try {
+        shim.init();
+      } catch(e) {
+        Cu.reportError(e);
+      }
+    }
   },
 
   init: function(global) {
@@ -520,7 +530,11 @@ let RemoteAddonsChild = {
 
   uninit: function(perTabShims) {
     for (let shim of perTabShims) {
-      shim.uninit();
+      try {
+        shim.uninit();
+      } catch(e) {
+        Cu.reportError(e);
+      }
     }
   },
 };