Skip to content

Commit b3b3600

Browse files
committed
Backed out 3 changesets (bug 1733356) for causing several hybrid bustages.
Backed out changeset 5398605eb0af (bug 1733356) Backed out changeset dead7940f720 (bug 1733356) Backed out changeset 97bab99ef206 (bug 1733356)
1 parent 64875c5 commit b3b3600

32 files changed

+24
-60
lines changed

netwerk/base/DefaultURI.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
#include "nsIClassInfoImpl.h"
77
#include "nsIObjectInputStream.h"
88
#include "nsIObjectOutputStream.h"
9-
#include "nsURLHelper.h"
10-
11-
#include "mozilla/ipc/URIParams.h"
12-
139
namespace mozilla {
1410
namespace net {
1511

netwerk/base/IOActivityMonitor.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88
#define IOActivityMonitor_h___
99

1010
#include "mozilla/dom/ChromeUtilsBinding.h"
11-
#include "mozilla/Mutex.h"
1211
#include "nsCOMPtr.h"
1312
#include "nscore.h"
1413
#include "nsClassHashtable.h"
1514
#include "nsTHashMap.h"
1615
#include "nsHashKeys.h"
17-
#include "nsINamed.h"
1816
#include "nsISupports.h"
1917
#include "prinrval.h"
2018
#include "prio.h"

netwerk/base/NetworkConnectivityService.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@
77
#include "mozilla/net/SocketProcessParent.h"
88
#include "mozilla/Preferences.h"
99
#include "mozilla/Services.h"
10-
#include "nsCOMPtr.h"
1110
#include "nsIOService.h"
12-
#include "nsICancelable.h"
1311
#include "xpcpublic.h"
1412
#include "nsSocketTransport2.h"
1513
#include "nsIHttpChannelInternal.h"
1614
#include "nsINetworkLinkService.h"
1715
#include "mozilla/StaticPrefs_network.h"
1816

19-
static mozilla::LazyLogModule gNCSLog("NetworkConnectivityService");
17+
static LazyLogModule gNCSLog("NetworkConnectivityService");
2018
#undef LOG
2119
#define LOG(args) MOZ_LOG(gNCSLog, mozilla::LogLevel::Debug, args)
2220

netwerk/base/NetworkConnectivityService.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
#define NetworkConnectivityService_h_
77

88
#include "nsINetworkConnectivityService.h"
9-
#include "nsCOMPtr.h"
109
#include "nsIObserver.h"
1110
#include "nsIDNSListener.h"
1211
#include "nsIStreamListener.h"
1312
#include "mozilla/net/DNS.h"
14-
#include "mozilla/Mutex.h"
1513

1614
namespace mozilla {
1715
namespace net {

netwerk/base/NetworkDataCountLayer.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
#define NetworkDataCountLayer_h__
99

1010
#include "prerror.h"
11-
#include "prio.h"
12-
#include "ErrorList.h"
1311

1412
namespace mozilla {
1513
namespace net {

netwerk/base/Predictor.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ static const uint32_t ONE_WEEK = 7U * ONE_DAY;
7373
static const uint32_t ONE_MONTH = 30U * ONE_DAY;
7474
static const uint32_t ONE_YEAR = 365U * ONE_DAY;
7575

76+
static const uint32_t STARTUP_WINDOW = 5U * 60U; // 5min
77+
7678
// Version of metadata entries we expect
7779
static const uint32_t METADATA_VERSION = 1;
7880

netwerk/base/SimpleBuffer.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
*/
1515

1616
#include "prtypes.h"
17-
#include "ErrorList.h"
1817
#include "mozilla/LinkedList.h"
19-
#include "nsISupportsImpl.h"
2018

2119
namespace mozilla {
2220
namespace net {

netwerk/base/SimpleChannel.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include "nsBaseChannel.h"
99
#include "nsIChannel.h"
1010
#include "nsIChildChannel.h"
11-
#include "nsICancelable.h"
1211
#include "nsIInputStream.h"
1312
#include "nsIRequest.h"
1413
#include "nsISupportsImpl.h"

netwerk/base/TLSServerSocket.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#ifndef mozilla_net_TLSServerSocket_h
77
#define mozilla_net_TLSServerSocket_h
88

9-
#include "nsIInterfaceRequestor.h"
109
#include "nsITLSServerSocket.h"
1110
#include "nsServerSocket.h"
1211
#include "nsString.h"

netwerk/base/ThrottleQueue.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "nsINamed.h"
1212
#include "nsIThrottledInputChannel.h"
1313
#include "nsITimer.h"
14-
#include "nsTArray.h"
1514

1615
namespace mozilla {
1716
namespace net {

0 commit comments

Comments
 (0)