Bug 913807 - Fix up merge conflicts
authorEd Morley <emorley@mozilla.com>
Fri, 20 Sep 2013 12:33:47 +0100
changeset 148138 ae09c5402cbe04b18e2427cc2412e2da4b261646
parent 148137 50843cebfab6b083da40c6a31e95e16ee37dc1f0
child 148139 bad2fbae18e8acafc86a5fb2720fe00aae4671c4
push id25327
push userkwierso@gmail.com
push dateSat, 21 Sep 2013 02:29:24 +0000
treeherdermozilla-central@a2c31dc69ab3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs913807
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 913807 - Fix up merge conflicts
netwerk/test/unit/test_about_networking.js
netwerk/test/unit/test_ping_aboutnetworking.js
--- a/netwerk/test/unit/test_about_networking.js
+++ b/netwerk/test/unit/test_about_networking.js
@@ -1,15 +1,13 @@
 /* -*- Mode: Javasript; indent-tab-mode: nil; js-indent-level: 2 -*- */
 /* 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/. */
 
-const Cu = Components.utils;
-
 Cu.import("resource://testing-common/httpd.js");
 
 const gDashboard = Cc['@mozilla.org/network/dashboard;1']
   .getService(Ci.nsIDashboard);
 
 const gServerSocket = Components.classes["@mozilla.org/network/server-socket;1"]
                              .createInstance(Components.interfaces.nsIServerSocket);
 const gHttpServer = new HttpServer();
--- a/netwerk/test/unit/test_ping_aboutnetworking.js
+++ b/netwerk/test/unit/test_ping_aboutnetworking.js
@@ -1,16 +1,13 @@
 /* -*- Mode: Javasript; indent-tab-mode: nil; js-indent-level: 2 -*- */
 /* 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/. */
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
 const gDashboard = Cc['@mozilla.org/network/dashboard;1']
   .getService(Ci.nsIDashboard);
 
 function connectionFailed(status) {
   let status_ok = [
                     "NS_NET_STATUS_RESOLVING_HOST"
                     ,"NS_NET_STATUS_RESOLVED_HOST"
                     ,"NS_NET_STATUS_CONNECTING_TO"