From 1fad784d0fa0c7d672fc5cfc49e8355129498792 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 23 Feb 2016 10:53:49 -0600
Subject: [PATCH] Bug 1249702 - Fix e10s feed handling with auto content
 handler prefs. r=Gijs

MozReview-Commit-ID: 3ggmJxUmuxp
---
 .../components/feeds/WebContentConverter.js   | 22 -------------------
 browser/modules/Feeds.jsm                     |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/browser/components/feeds/WebContentConverter.js b/browser/components/feeds/WebContentConverter.js
index bb65e2ecc13..2de38e2f056 100644
--- a/browser/components/feeds/WebContentConverter.js
+++ b/browser/components/feeds/WebContentConverter.js
@@ -901,28 +901,6 @@ WebContentConverterRegistrarContent.prototype = {
         // do nothing, the next branch might have values
       }
     }
-
-    // We need to do this _after_ registering all of the available handlers,
-    // so that getWebContentHandlerByURI can return successfully.
-    let autoBranch;
-    try {
-      autoBranch = ps.getBranch(PREF_CONTENTHANDLERS_AUTO);
-    } catch (e) {
-      // No auto branch yet, that's fine
-      //LOG("WCCR.init: There is no auto branch, benign");
-    }
-
-    if (autoBranch) {
-      for (let type of autoBranch.getChildList("")) {
-        let uri = autoBranch.getCharPref(type);
-        if (uri) {
-          let handler = this.getWebContentHandlerByURI(type, uri);
-          if (handler) {
-            this._setAutoHandler(type, handler);
-          }
-        }
-      }
-    }
   },
 
   _typeIsRegistered(contentType, uri) {
diff --git a/browser/modules/Feeds.jsm b/browser/modules/Feeds.jsm
index 9f2637a0ec3..3a9d6cd7476 100644
--- a/browser/modules/Feeds.jsm
+++ b/browser/modules/Feeds.jsm
@@ -46,7 +46,7 @@ this.Feeds = {
 
       case "WCCR:setAutoHandler": {
         let registrar = Cc["@mozilla.org/embeddor.implemented/web-content-handler-registrar;1"].
-                          getService(Ci.nsIWebContentHandlerRegistrar);
+                          getService(Ci.nsIWebContentConverterService);
         registrar.setAutoHandler(data.contentType, data.handler);
         break;
       }