From b399f1942620fe653f1f89f5dfd656ee7d2b6f23 Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Fri, 19 Sep 2014 15:30:27 -0500
Subject: [PATCH] Bug 1064496 review changes

---
 extensions/firefox/content/PdfJs.jsm              |  2 --
 extensions/firefox/content/PdfStreamConverter.jsm |  3 ---
 extensions/firefox/content/PdfjsChromeUtils.jsm   | 15 ++++++---------
 extensions/firefox/content/PdfjsContentUtils.jsm  |  5 -----
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/extensions/firefox/content/PdfJs.jsm b/extensions/firefox/content/PdfJs.jsm
index 679160e2e..4ae21fc10 100644
--- a/extensions/firefox/content/PdfJs.jsm
+++ b/extensions/firefox/content/PdfJs.jsm
@@ -42,8 +42,6 @@ XPCOMUtils.defineLazyServiceGetter(Svc, 'mime',
 XPCOMUtils.defineLazyServiceGetter(Svc, 'pluginHost',
                                    '@mozilla.org/plugin/host;1',
                                    'nsIPluginHost');
-XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils",
-                                  "resource://gre/modules/BrowserUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PdfjsChromeUtils",
                                   "resource://pdf.js/PdfjsChromeUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PdfjsContentUtils",
diff --git a/extensions/firefox/content/PdfStreamConverter.jsm b/extensions/firefox/content/PdfStreamConverter.jsm
index 5b7a61780..c01c46db3 100644
--- a/extensions/firefox/content/PdfStreamConverter.jsm
+++ b/extensions/firefox/content/PdfStreamConverter.jsm
@@ -51,9 +51,6 @@ XPCOMUtils.defineLazyModuleGetter(this, 'PdfJsTelemetry',
 XPCOMUtils.defineLazyModuleGetter(this, 'PdfjsContentUtils',
   'resource://pdf.js/PdfjsContentUtils.jsm');
 
-XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils",
-  'resource://gre/modules/BrowserUtils.jsm');
-
 var Svc = {};
 XPCOMUtils.defineLazyServiceGetter(Svc, 'mime',
                                    '@mozilla.org/mime;1',
diff --git a/extensions/firefox/content/PdfjsChromeUtils.jsm b/extensions/firefox/content/PdfjsChromeUtils.jsm
index 8b28ce45d..f24f4abb4 100644
--- a/extensions/firefox/content/PdfjsChromeUtils.jsm
+++ b/extensions/firefox/content/PdfjsChromeUtils.jsm
@@ -31,9 +31,6 @@ const PDF_CONTENT_TYPE = 'application/pdf';
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 Cu.import('resource://gre/modules/Services.jsm');
 
-XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils",
-                                  "resource://gre/modules/BrowserUtils.jsm");
-
 let Svc = {};
 XPCOMUtils.defineLazyServiceGetter(Svc, 'mime',
                                    '@mozilla.org/mime;1',
@@ -125,19 +122,19 @@ let PdfjsChromeUtils = {
   receiveMessage: function (aMsg) {
     switch (aMsg.name) {
       case "PDFJS:Parent:clearUserPref":
-        this._clearUserPref(aMsg.json.name);
+        this._clearUserPref(aMsg.data.name);
         break;
       case "PDFJS:Parent:setIntPref":
-        this._setIntPref(aMsg.json.name, aMsg.json.value);
+        this._setIntPref(aMsg.data.name, aMsg.data.value);
         break;
       case "PDFJS:Parent:setBoolPref":
-        this._setBoolPref(aMsg.json.name, aMsg.json.value);
+        this._setBoolPref(aMsg.data.name, aMsg.data.value);
         break;
       case "PDFJS:Parent:setCharPref":
-        this._setCharPref(aMsg.json.name, aMsg.json.value);
+        this._setCharPref(aMsg.data.name, aMsg.data.value);
         break;
       case "PDFJS:Parent:setStringPref":
-        this._setStringPref(aMsg.json.name, aMsg.json.value);
+        this._setStringPref(aMsg.data.name, aMsg.data.value);
         break;
       case "PDFJS:Parent:isDefaultHandlerApp":
         return this.isDefaultHandlerApp();
@@ -231,7 +228,7 @@ let PdfjsChromeUtils = {
    * a pdf displayed correctly.
    */
   _displayWarning: function (aMsg) {
-    let json = aMsg.json;
+    let json = aMsg.data;
     let browser = aMsg.target;
     let cpowCallback = aMsg.objects.callback;
     let tabbrowser = browser.getTabBrowser();
diff --git a/extensions/firefox/content/PdfjsContentUtils.jsm b/extensions/firefox/content/PdfjsContentUtils.jsm
index d8a5acd43..84e36f6b5 100644
--- a/extensions/firefox/content/PdfjsContentUtils.jsm
+++ b/extensions/firefox/content/PdfjsContentUtils.jsm
@@ -25,9 +25,6 @@ const Cu = Components.utils;
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 Cu.import('resource://gre/modules/Services.jsm');
 
-XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils",
-                                  "resource://gre/modules/BrowserUtils.jsm");
-
 let PdfjsContentUtils = {
   _mm: null,
 
@@ -113,8 +110,6 @@ let PdfjsContentUtils = {
     // the child's dom frame mm associated with the window.
     let winmm = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
                        .getInterface(Ci.nsIDocShell)
-                       .sameTypeRootTreeItem
-                       .QueryInterface(Ci.nsIDocShell)
                        .QueryInterface(Ci.nsIInterfaceRequestor)
                        .getInterface(Ci.nsIContentFrameMessageManager);
     winmm.sendAsyncMessage("PDFJS:Parent:displayWarning", {