From 585a5b420dd0af0e73f405d944099331c5ed5611 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Sat, 12 Sep 2015 01:19:26 +0900
Subject: [PATCH] Bug 895274 part.208 Rename NS_NETWORK_UPLOAD_EVENT to
 eNetworkUpload r=smaug

---
 dom/base/nsGlobalWindow.cpp         | 6 +++---
 dom/events/EventListenerManager.cpp | 4 ++--
 dom/events/EventNameList.h          | 2 +-
 widget/EventMessageList.h           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index ffe82d6cd808..772d66600c57 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -1449,7 +1449,7 @@ nsGlobalWindow::CleanUp()
     }
 
 #ifdef MOZ_B2G
-    DisableNetworkEvent(NS_NETWORK_UPLOAD_EVENT);
+    DisableNetworkEvent(eNetworkUpload);
     DisableNetworkEvent(eNetworkDownload);
 #endif // MOZ_B2G
 
@@ -14601,7 +14601,7 @@ nsGlobalWindow::EnableNetworkEvent(EventMessage aEventMessage)
   }
 
   switch (aEventMessage) {
-    case NS_NETWORK_UPLOAD_EVENT:
+    case eNetworkUpload:
       if (!mNetworkUploadObserverEnabled) {
         mNetworkUploadObserverEnabled = true;
         os->AddObserver(mObserver, NS_NETWORK_ACTIVITY_BLIP_UPLOAD_TOPIC, false);
@@ -14629,7 +14629,7 @@ nsGlobalWindow::DisableNetworkEvent(EventMessage aEventMessage)
   }
 
   switch (aEventMessage) {
-    case NS_NETWORK_UPLOAD_EVENT:
+    case eNetworkUpload:
       if (mNetworkUploadObserverEnabled) {
         mNetworkUploadObserverEnabled = false;
         os->RemoveObserver(mObserver, NS_NETWORK_ACTIVITY_BLIP_UPLOAD_TOPIC);
diff --git a/dom/events/EventListenerManager.cpp b/dom/events/EventListenerManager.cpp
index aab88d9a19ce..d5d69f840b62 100644
--- a/dom/events/EventListenerManager.cpp
+++ b/dom/events/EventListenerManager.cpp
@@ -334,7 +334,7 @@ EventListenerManager::AddEventListenerInternal(
   } else if (aTypeAtom == nsGkAtoms::onmoznetworkupload) {
     nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
     if (window) {
-      window->EnableNetworkEvent(NS_NETWORK_UPLOAD_EVENT);
+      window->EnableNetworkEvent(eNetworkUpload);
     }
   } else if (aTypeAtom == nsGkAtoms::onmoznetworkdownload) {
     nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
@@ -511,7 +511,7 @@ EventListenerManager::RemoveEventListenerInternal(
   bool deviceType = IsDeviceType(aEventMessage);
 #ifdef MOZ_B2G
   bool timeChangeEvent = (aEventMessage == eTimeChange);
-  bool networkEvent = (aEventMessage == NS_NETWORK_UPLOAD_EVENT ||
+  bool networkEvent = (aEventMessage == eNetworkUpload ||
                        aEventMessage == eNetworkDownload);
 #endif // MOZ_B2G
 
diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h
index a5d6b437c4d7..ec4476d276cb 100644
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -554,7 +554,7 @@ WINDOW_ONLY_EVENT(moztimechange,
                   EventNameType_None,
                   eBasicEventClass)
 WINDOW_ONLY_EVENT(moznetworkupload,
-                  NS_NETWORK_UPLOAD_EVENT,
+                  eNetworkUpload,
                   EventNameType_None,
                   eBasicEventClass)
 WINDOW_ONLY_EVENT(moznetworkdownload,
diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h
index be1aaf7f406e..76068b5cc881 100644
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -399,7 +399,7 @@ NS_EVENT_MESSAGE(eTimeChange,            5500)
 
 // Network packet events.
 NS_EVENT_MESSAGE(NS_NETWORK_EVENT_START,    5600)
-NS_EVENT_MESSAGE(NS_NETWORK_UPLOAD_EVENT,   NS_NETWORK_EVENT_START + 1)
+NS_EVENT_MESSAGE(eNetworkUpload,         NS_NETWORK_EVENT_START + 1)
 NS_EVENT_MESSAGE(eNetworkDownload,       NS_NETWORK_EVENT_START + 2)
 
 // MediaRecorder events.