diff options
Diffstat (limited to 'netwerk/protocol/ftp')
| -rw-r--r-- | netwerk/protocol/ftp/nsFtpConnectionThread.cpp | 47 | ||||
| -rw-r--r-- | netwerk/protocol/ftp/nsFtpConnectionThread.h | 9 |
2 files changed, 0 insertions, 56 deletions
diff --git a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp index 1119fcff5..2ae12846a 100644 --- a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp +++ b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp @@ -45,10 +45,6 @@ #include "nsIAuthPrompt2.h" #include "nsIFTPChannelParentInternal.h" -#ifdef MOZ_WIDGET_GONK -#include "NetStatistics.h" -#endif - using namespace mozilla; using namespace mozilla::net; @@ -1619,13 +1615,6 @@ nsFtpState::Init(nsFtpChannel *channel) // initialize counter for network metering mCountRecv = 0; -#ifdef MOZ_WIDGET_GONK - nsCOMPtr<nsINetworkInfo> activeNetworkInfo; - GetActiveNetworkInfo(activeNetworkInfo); - mActiveNetworkInfo = - new nsMainThreadPtrHolder<nsINetworkInfo>(activeNetworkInfo); -#endif - mKeepRunning = true; mSuppliedEntityID = channel->EntityID(); @@ -2104,43 +2093,7 @@ nsFtpState::ReadSegments(nsWriteSegmentFun writer, void *closure, nsresult nsFtpState::SaveNetworkStats(bool enforce) { -#ifdef MOZ_WIDGET_GONK - // Obtain app id - uint32_t appId; - bool isInBrowser; - NS_GetAppInfo(mChannel, &appId, &isInBrowser); - - // Check if active network and appid are valid. - if (!mActiveNetworkInfo || appId == NECKO_NO_APP_ID) { - return NS_OK; - } - - if (mCountRecv <= 0) { - // There is no traffic, no need to save. - return NS_OK; - } - - // If |enforce| is false, the traffic amount is saved - // only when the total amount exceeds the predefined - // threshold. - if (!enforce && mCountRecv < NETWORK_STATS_THRESHOLD) { - return NS_OK; - } - - // Create the event to save the network statistics. - // the event is then dispathed to the main thread. - RefPtr<Runnable> event = - new SaveNetworkStatsEvent(appId, isInBrowser, mActiveNetworkInfo, - mCountRecv, 0, false); - NS_DispatchToMainThread(event); - - // Reset the counters after saving. - mCountRecv = 0; - - return NS_OK; -#else return NS_ERROR_NOT_IMPLEMENTED; -#endif } NS_IMETHODIMP diff --git a/netwerk/protocol/ftp/nsFtpConnectionThread.h b/netwerk/protocol/ftp/nsFtpConnectionThread.h index dd48da562..b4e71bd10 100644 --- a/netwerk/protocol/ftp/nsFtpConnectionThread.h +++ b/netwerk/protocol/ftp/nsFtpConnectionThread.h @@ -17,11 +17,6 @@ #include "nsFtpControlConnection.h" #include "nsIProtocolProxyCallback.h" -#ifdef MOZ_WIDGET_GONK -#include "nsINetworkInterface.h" -#include "nsProxyRelease.h" -#endif - // ftp server types #define FTP_GENERIC_TYPE 0 #define FTP_UNIX_TYPE 1 @@ -215,11 +210,7 @@ private: bool mDeferredCallbackPending; // These members are used for network per-app metering (bug 855948) -// Currently, they are only available on gonk. uint64_t mCountRecv; -#ifdef MOZ_WIDGET_GONK - nsMainThreadPtrHandle<nsINetworkInfo> mActiveNetworkInfo; -#endif nsresult SaveNetworkStats(bool); void CountRecvBytes(uint64_t recvBytes) { |