Bug 913807 - Fix up merge conflicts

netwerk/test/unit/test_about_networking.js

@@ -3,8 +3,6 @@
  * 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/. */
 
-const Cu = Components.utils;
-
 Cu.import("resource://testing-common/httpd.js");
 
 const gDashboard = Cc['@mozilla.org/network/dashboard;1']

netwerk/test/unit/test_ping_aboutnetworking.js

@@ -3,9 +3,6 @@
  * 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/. */
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
 const gDashboard = Cc['@mozilla.org/network/dashboard;1']
   .getService(Ci.nsIDashboard);