Fix up some errors.

jsha · jsha · commit 8a06222b8b83 · 2015-01-22T14:48:41.000-08:00
Remove spurious INCLUDE(md5).
Restore accidentally-deleted INCLUDE line.
Import XPCCOMUtils where needed.
diff --git a/src/chrome/content/code/ChannelReplacement.js b/src/chrome/content/code/ChannelReplacement.js
@@ -1,3 +1,5 @@
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
 function CtxCapturingListener(tracingChannel, captureObserver) {
   this.originalListener = tracingChannel.setNewListener(this);
   this.captureObserver = captureObserver;
diff --git a/src/chrome/content/code/Cookie.js b/src/chrome/content/code/Cookie.js
@@ -1,3 +1,5 @@
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
 function Cookie(s, host) {
   this.parse(s, host);
 }
diff --git a/src/chrome/content/code/IOUtil.js b/src/chrome/content/code/IOUtil.js
@@ -1,3 +1,5 @@
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
 const IO = {
   readFile: function(file, charset) {
     var res;
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -132,6 +132,8 @@ function xpcom_checkInterfaces(iid,iids,ex) {
   throw ex;
 }
 
+INCLUDE('ChannelReplacement', 'IOUtil', 'HTTPSRules', 'HTTPS', 'Thread', 'ApplicableList');
+
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 // This is black magic for storing Expando data w/ an nsIDOMWindow 
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
@@ -57,7 +57,6 @@ INCLUDE('Root-CAs');
 INCLUDE('sha256');
 INCLUDE('X509ChainWhitelist');
 INCLUDE('NSS');
-INCLUDE('md5');
 
 function SSLObservatory() {
   this.prefs = CC["@mozilla.org/preferences-service;1"]

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");`
	`2`	`+`
`1`	`3`	`function CtxCapturingListener(tracingChannel, captureObserver) {`
`2`	`4`	`this.originalListener = tracingChannel.setNewListener(this);`
`3`	`5`	`this.captureObserver = captureObserver;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");`
	`2`	`+`
`1`	`3`	`function Cookie(s, host) {`
`2`	`4`	`this.parse(s, host);`
`3`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");`
	`2`	`+`
`1`	`3`	`const IO = {`
`2`	`4`	`readFile: function(file, charset) {`
`3`	`5`	`var res;`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,8 @@ function xpcom_checkInterfaces(iid,iids,ex) {`
`132`	`132`	`throw ex;`
`133`	`133`	`}`
`134`	`134`
	`135`	`+INCLUDE('ChannelReplacement', 'IOUtil', 'HTTPSRules', 'HTTPS', 'Thread', 'ApplicableList');`
	`136`	`+`
`135`	`137`	`Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");`
`136`	`138`
`137`	`139`	`// This is black magic for storing Expando data w/ an nsIDOMWindow`