Bug 917266 - Remove some unneeded code in netwerk/; r=mcmanus

netwerk/base/src/nsDNSPrefetch.cpp

@@ -14,7 +14,6 @@
 #include "nsIDNSService.h"
 #include "nsICancelable.h"
 
-static NS_DEFINE_CID(kDNSServiceCID, NS_DNSSERVICE_CID);
 static nsIDNSService *sDNSService = nullptr;
 
 nsresult

netwerk/cache/nsCacheService.cpp

@@ -107,7 +107,6 @@ static const char * prefList[] = {
 
 // Cache sizes, in KB
 const int32_t DEFAULT_CACHE_SIZE = 250 * 1024;  // 250 MB
-const int32_t MIN_CACHE_SIZE = 50 * 1024;       //  50 MB
 #ifdef ANDROID
 const int32_t MAX_CACHE_SIZE = 200 * 1024;      // 200 MB
 const int32_t OLD_MAX_CACHE_SIZE = 200 * 1024;  // 200 MB

netwerk/cookie/CookieServiceChild.cpp

@@ -19,7 +19,7 @@ namespace net {
 // Behavior pref constants
 static const int32_t BEHAVIOR_ACCEPT = 0;
 static const int32_t BEHAVIOR_REJECTFOREIGN = 1;
-static const int32_t BEHAVIOR_REJECT = 2;
+// static const int32_t BEHAVIOR_REJECT = 2;
 static const int32_t BEHAVIOR_LIMITFOREIGN = 3;
 
 // Pref string constants

netwerk/protocol/ftp/nsFTPChannel.cpp

@@ -24,17 +24,6 @@
 extern PRLogModuleInfo* gFTPLog;
 #endif /* PR_LOGGING */
 
-////////////// this needs to move to nspr
-static inline uint32_t
-PRTimeToSeconds(PRTime t_usec)
-{
-    return uint32_t(t_usec / PR_USEC_PER_SEC);
-}
-
-#define NowInSeconds() PRTimeToSeconds(PR_Now())
-////////////// end
-
-
 // There are two transport connections established for an 
 // ftp connection. One is used for the command channel , and
 // the other for the data channel. The command channel is the first

netwerk/protocol/http/nsHttpConnection.cpp

@@ -33,8 +33,6 @@
 extern PRThread *gSocketThread;
 #endif
 
-static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
-
 using namespace mozilla;
 using namespace mozilla::net;
 

netwerk/protocol/http/nsHttpConnectionMgr.cpp

@@ -32,8 +32,6 @@ using namespace mozilla::net;
 // defined by the socket transport service while active
 extern PRThread *gSocketThread;
 
-static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
-
 //-----------------------------------------------------------------------------
 
 

netwerk/protocol/http/nsHttpHandler.cpp

@@ -82,12 +82,6 @@ using namespace mozilla::net;
 extern PRThread *gSocketThread;
 #endif
 
-static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID);
-static NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID);
-static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID);
-static NS_DEFINE_CID(kSocketProviderServiceCID, NS_SOCKETPROVIDERSERVICE_CID);
-
 #define UA_PREF_PREFIX          "general.useragent."
 #ifdef XP_WIN
 #define UA_SPARE_PLATFORM

netwerk/streamconv/converters/mozTXTToHTMLConv.cpp

@@ -12,8 +12,6 @@
 #include "nsCRT.h"
 #include "nsIExternalProtocolHandler.h"
 
-static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-
 #ifdef DEBUG_BenB_Perf
 #include "prtime.h"
 #include "prinrval.h"

netwerk/test/TestCookie.cpp

@@ -26,7 +26,6 @@ static const char kCookiesPermissions[] = "network.cookie.cookieBehavior";
 static const char kCookiesLifetimeEnabled[] = "network.cookie.lifetime.enabled";
 static const char kCookiesLifetimeDays[] = "network.cookie.lifetime.days";
 static const char kCookiesLifetimeCurrentSession[] = "network.cookie.lifetime.behavior";
-static const char kCookiesP3PString[] = "network.cookie.p3p";
 static const char kCookiesAskPermission[] = "network.cookie.warnAboutCookies";
 static const char kCookiesMaxPerHost[] = "network.cookie.maxPerHost";