Skip to content

Commit bb6dc0e

Browse files
committed
Backed out changeset dab1c5badddb (bug 1407679) for failing server startup in mochitests on Android. r=backout on a CLOSED TREE
UltraBlame original commit: 2f41083748aec88ddef355a0de1e7b5db1da26df
1 parent a2d459c commit bb6dc0e

File tree

20 files changed

+816
-311
lines changed

20 files changed

+816
-311
lines changed

dom/events/test/test_bug336682.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ SpecialPowers
627627
.
628628
Ci
629629
.
630-
nsIIOService
630+
nsIIOService2
631631
)
632632
;
633633
iosvc

dom/workers/test/test_onLine.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@
445445
.
446446
Ci
447447
.
448-
nsIIOService
448+
nsIIOService2
449449
)
450450
;
451451
iosvc

layout/tools/reftest/bootstrap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ getService
377377
(
378378
Ci
379379
.
380-
nsIIOService
380+
nsIIOService2
381381
)
382382
;
383383
ios

mobile/android/tests/browser/robocop/robocop_head.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ Components
403403
.
404404
interfaces
405405
.
406-
nsIIOService
406+
nsIIOService2
407407
)
408408
;
409409
ios

netwerk/base/moz.build

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,11 @@ nsIIOService
330330
idl
331331
'
332332
'
333+
nsIIOService2
334+
.
335+
idl
336+
'
337+
'
333338
nsILoadContextInfo
334339
.
335340
idl

netwerk/base/nsIIOService.idl

Lines changed: 0 additions & 294 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,300 +1185,6 @@ nsIURI
11851185
aURI
11861186
)
11871187
;
1188-
/
1189-
*
1190-
*
1191-
*
1192-
While
1193-
this
1194-
is
1195-
set
1196-
IOService
1197-
will
1198-
monitor
1199-
an
1200-
nsINetworkLinkService
1201-
*
1202-
(
1203-
if
1204-
available
1205-
)
1206-
and
1207-
set
1208-
its
1209-
offline
1210-
status
1211-
to
1212-
"
1213-
true
1214-
"
1215-
whenever
1216-
*
1217-
isLinkUp
1218-
is
1219-
false
1220-
.
1221-
*
1222-
*
1223-
Applications
1224-
that
1225-
want
1226-
to
1227-
control
1228-
changes
1229-
to
1230-
the
1231-
IOService
1232-
'
1233-
s
1234-
offline
1235-
*
1236-
status
1237-
should
1238-
set
1239-
this
1240-
to
1241-
false
1242-
watch
1243-
for
1244-
network
1245-
:
1246-
link
1247-
-
1248-
status
1249-
-
1250-
changed
1251-
*
1252-
broadcasts
1253-
and
1254-
change
1255-
nsIIOService
1256-
:
1257-
:
1258-
offline
1259-
as
1260-
they
1261-
see
1262-
fit
1263-
.
1264-
Note
1265-
*
1266-
that
1267-
this
1268-
means
1269-
during
1270-
application
1271-
startup
1272-
IOService
1273-
may
1274-
be
1275-
offline
1276-
*
1277-
if
1278-
there
1279-
is
1280-
no
1281-
link
1282-
until
1283-
application
1284-
code
1285-
runs
1286-
and
1287-
can
1288-
turn
1289-
off
1290-
*
1291-
this
1292-
management
1293-
.
1294-
*
1295-
/
1296-
attribute
1297-
boolean
1298-
manageOfflineStatus
1299-
;
1300-
/
1301-
*
1302-
*
1303-
*
1304-
Creates
1305-
a
1306-
channel
1307-
for
1308-
a
1309-
given
1310-
URI
1311-
.
1312-
*
1313-
*
1314-
param
1315-
aURI
1316-
*
1317-
nsIURI
1318-
from
1319-
which
1320-
to
1321-
make
1322-
a
1323-
channel
1324-
*
1325-
param
1326-
aProxyURI
1327-
*
1328-
nsIURI
1329-
to
1330-
use
1331-
for
1332-
proxy
1333-
resolution
1334-
.
1335-
Can
1336-
be
1337-
null
1338-
in
1339-
which
1340-
*
1341-
case
1342-
aURI
1343-
is
1344-
used
1345-
*
1346-
param
1347-
aProxyFlags
1348-
flags
1349-
from
1350-
nsIProtocolProxyService
1351-
to
1352-
use
1353-
*
1354-
when
1355-
resolving
1356-
proxies
1357-
for
1358-
this
1359-
new
1360-
channel
1361-
*
1362-
param
1363-
aLoadingNode
1364-
*
1365-
param
1366-
aLoadingPrincipal
1367-
*
1368-
param
1369-
aTriggeringPrincipal
1370-
*
1371-
param
1372-
aSecurityFlags
1373-
*
1374-
param
1375-
aContentPolicyType
1376-
*
1377-
These
1378-
will
1379-
be
1380-
used
1381-
as
1382-
values
1383-
for
1384-
the
1385-
nsILoadInfo
1386-
object
1387-
on
1388-
the
1389-
*
1390-
created
1391-
channel
1392-
.
1393-
For
1394-
details
1395-
see
1396-
nsILoadInfo
1397-
in
1398-
nsILoadInfo
1399-
.
1400-
idl
1401-
*
1402-
return
1403-
reference
1404-
to
1405-
the
1406-
new
1407-
nsIChannel
1408-
object
1409-
*
1410-
*
1411-
Please
1412-
note
1413-
if
1414-
you
1415-
provide
1416-
both
1417-
a
1418-
loadingNode
1419-
and
1420-
a
1421-
loadingPrincipal
1422-
*
1423-
then
1424-
loadingPrincipal
1425-
must
1426-
be
1427-
equal
1428-
to
1429-
loadingNode
1430-
-
1431-
>
1432-
NodePrincipal
1433-
(
1434-
)
1435-
.
1436-
*
1437-
But
1438-
less
1439-
error
1440-
prone
1441-
is
1442-
to
1443-
just
1444-
supply
1445-
a
1446-
loadingNode
1447-
.
1448-
*
1449-
/
1450-
nsIChannel
1451-
newChannelFromURIWithProxyFlags2
1452-
(
1453-
in
1454-
nsIURI
1455-
aURI
1456-
in
1457-
nsIURI
1458-
aProxyURI
1459-
in
1460-
unsigned
1461-
long
1462-
aProxyFlags
1463-
in
1464-
nsIDOMNode
1465-
aLoadingNode
1466-
in
1467-
nsIPrincipal
1468-
aLoadingPrincipal
1469-
in
1470-
nsIPrincipal
1471-
aTriggeringPrincipal
1472-
in
1473-
unsigned
1474-
long
1475-
aSecurityFlags
1476-
in
1477-
unsigned
1478-
long
1479-
aContentPolicyType
1480-
)
1481-
;
14821188
}
14831189
;
14841190
%

0 commit comments

Comments
 (0)