Bug 1220160 - part 2: use mozDocumentURIIfNotForErrorPages for context menu's docLocation, r=MattN

MozReview-Commit-ID: 7hBFzeh5jpz

--HG--
extra : rebase_source : 31efefd60d0fe7788986439a3fd39dd6608910b7

browser/base/content/content.js

@@ -99,7 +99,7 @@ var handleContentContextMenu = function (event) {
   Services.obs.notifyObservers(subject, "content-contextmenu", null);
 
   let doc = event.target.ownerDocument;
-  let docLocation = doc.location ? doc.location.href : undefined;
+  let docLocation = doc.mozDocumentURIIfNotForErrorPages;
   let charSet = doc.characterSet;
   let baseURI = doc.baseURI;
   let referrer = doc.referrer;
@@ -277,7 +277,6 @@ var AboutCertErrorListener = {
     // if we're enabling reports, send a report for this failure
     if (event.detail) {
       let doc = content.document;
-      let location = doc.location.href;
 
       let serhelper = Cc["@mozilla.org/network/serialization-helper;1"]
           .getService(Ci.nsISerializationHelper);
@@ -351,8 +350,6 @@ var AboutNetErrorListener = {
     if (evt.detail) {
       let contentDoc = content.document;
 
-      let location = contentDoc.location.href;
-
       let serhelper = Cc["@mozilla.org/network/serialization-helper;1"]
                         .getService(Ci.nsISerializationHelper);