Bug 1432992, part 2 - Manually remove some empty blocks. r=florian

Also, remove a now-obsolete comment from placesOverlay.xul and remove
some now-empty XPCShell test head files.

MozReview-Commit-ID: 6kKVQu8FAL3

--HG--
extra : rebase_source : 7dd05818d68a15bd170af734078db4ba45029d80

browser/components/places/content/placesOverlay.xul

@@ -18,9 +18,6 @@
   <script type="application/javascript"
           src="chrome://browser/content/utilityOverlay.js"/>
   <script type="application/javascript"><![CDATA[
-    // TODO: Bug 406371.
-    // A bunch of browser code depends on us defining these, sad but true :(
-
     ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
     ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
     ChromeUtils.defineModuleGetter(window,

dom/events/test/test_bug415498.xul

@@ -22,9 +22,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=415498
   <script class="testbody" type="application/javascript"><![CDATA[
 
     /** Test for Bug 415498 **/
-    if (Cc === undefined) {
-    }
-
     SimpleTest.waitForExplicitFinish();
 
     var gTestsIterator;

netwerk/test/unit_ipc/xpcshell.ini

@@ -1,5 +1,5 @@
 [DEFAULT]
-head = head_channels_clone.js head_cc.js
+head = head_channels_clone.js
 skip-if = toolkit == 'android'
 support-files =
   child_channel_id.js

testing/mochitest/browser-harness.xul

@@ -63,9 +63,6 @@
     }
   ]]></style>
   <script type="application/javascript"><![CDATA[
-    if (Cc === undefined) {
-    }
-
     var gConfig;
 
     var gDumper = {

testing/mochitest/harness.xul

@@ -27,9 +27,6 @@
           src="chrome://mochikit/content/tests/SimpleTest/setup.js" />
   <script type="application/javascript"><![CDATA[
 
-if (Cc === undefined) {
-}
-
 function loadTests()
 {
   window.removeEventListener("load", loadTests, false);

testing/specialpowers/content/SpecialPowersObserver.jsm

@@ -17,9 +17,6 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 Components.utils.importGlobalProperties(["File"]);
 
-if (typeof(Cc) == "undefined") {
-}
-
 const CHILD_SCRIPT = "chrome://specialpowers/content/specialpowers.js";
 const CHILD_SCRIPT_API = "chrome://specialpowers/content/specialpowersAPI.js";
 const CHILD_LOGGER_SCRIPT = "chrome://specialpowers/content/MozillaLogger.js";

testing/specialpowers/content/SpecialPowersObserverAPI.js

@@ -13,12 +13,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   Services: "resource://gre/modules/Services.jsm",
 });
 
-if (typeof(Ci) == "undefined") {
-}
-
-if (typeof(Cc) == "undefined") {
-}
-
 this.SpecialPowersError = function(aMsg) {
   Error.call(this);
   // let {stack} = new Error();

testing/talos/talos/pageloader/chrome/MozillaFileLogger.js

@@ -9,10 +9,6 @@ function dumpLog(msg) {
   MozillaFileLogger.log(msg);
 }
 
-
-if (Cc === undefined) {
-}
-
 const FOSTREAM_CID = "@mozilla.org/network/file-output-stream;1";
 const LF_CID = "@mozilla.org/file/local;1";
 

testing/talos/talos/pageloader/chrome/pageloader.js

@@ -5,11 +5,6 @@
 /* import-globals-from report.js */
 /* eslint mozilla/avoid-Date-timing: "off" */
 
-try {
-  if (Cc === undefined) {
-  }
-} catch (ex) {}
-
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/E10SUtils.jsm");
 

tools/code-coverage/tests/xpcshell/head.js

@@ -1,4 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-

tools/code-coverage/tests/xpcshell/xpcshell.ini

@@ -1,5 +1,2 @@
-[DEFAULT]
-head = head.js
-
 [test_basic.js]
 [test_basic_child_and_parent.js]