Bug 1091479, Patch2: Rename enum members, r=sinker.

dom/wifi/WifiProxyService.cpp

@@ -71,7 +71,7 @@ public:
 #ifdef MOZ_TASK_TRACER
       // Make wifi initialization events to be the source events of TaskTracer,
       // and originate the rest correlation tasks from here.
-      AutoSourceEvent taskTracerEvent(SourceEventType::WIFI);
+      AutoSourceEvent taskTracerEvent(SourceEventType::Wifi);
       AddLabel("%s %s", mInterface.get(), NS_ConvertUTF16toUTF8(event).get());
 #endif
       nsCOMPtr<nsIRunnable> runnable = new WifiEventDispatcher(event, mInterface);

ipc/unixsocket/SocketBase.h

@@ -503,7 +503,7 @@ public:
 #ifdef MOZ_TASK_TRACER
     // Make unix socket creation events to be the source events of TaskTracer,
     // and originate the rest correlation tasks from here.
-    AutoSourceEvent taskTracerEvent(SourceEventType::UNIXSOCKET);
+    AutoSourceEvent taskTracerEvent(SourceEventType::Unixsocket);
 #endif
 
     nsRefPtr<nsRunnable> r =

layout/base/nsPresShell.cpp

@@ -7236,13 +7236,13 @@ PresShell::HandleEvent(nsIFrame* aFrame,
 #ifdef MOZ_TASK_TRACER
   // Make touch events, mouse events and hardware key events to be the source
   // events of TaskTracer, and originate the rest correlation tasks from here.
-  SourceEventType type = SourceEventType::UNKNOWN;
+  SourceEventType type = SourceEventType::Unknown;
   if (WidgetTouchEvent* inputEvent = aEvent->AsTouchEvent()) {
-    type = SourceEventType::TOUCH;
+    type = SourceEventType::Touch;
   } else if (WidgetMouseEvent* inputEvent = aEvent->AsMouseEvent()) {
-    type = SourceEventType::MOUSE;
+    type = SourceEventType::Mouse;
   } else if (WidgetKeyboardEvent* inputEvent = aEvent->AsKeyboardEvent()) {
-    type = SourceEventType::KEY;
+    type = SourceEventType::Key;
   }
   AutoSourceEvent taskTracerEvent(type);
 #endif

tools/profiler/GeckoTaskTracer.h

@@ -44,13 +44,13 @@ void ShutdownTaskTracer();
 class FakeTracedTask;
 
 enum SourceEventType {
-  UNKNOWN = 0,
-  TOUCH,
-  MOUSE,
-  KEY,
-  BLUETOOTH,
-  UNIXSOCKET,
-  WIFI
+  Unknown = 0,
+  Touch,
+  Mouse,
+  Key,
+  Bluetooth,
+  Unixsocket,
+  Wifi
 };
 
 class AutoSourceEvent

tools/profiler/GeckoTaskTracerImpl.h

@@ -23,8 +23,8 @@ struct TraceInfo
     , mCurTaskId(0)
     , mSavedCurTraceSourceId(0)
     , mSavedCurTaskId(0)
-    , mCurTraceSourceType(UNKNOWN)
-    , mSavedCurTraceSourceType(UNKNOWN)
+    , mCurTraceSourceType(Unknown)
+    , mSavedCurTraceSourceType(Unknown)
     , mThreadId(aThreadId)
     , mLastUniqueTaskId(0)
     , mStartLogging(aStartLogging)

tools/profiler/TracedTaskCommon.cpp

@@ -12,7 +12,7 @@ namespace tasktracer {
 
 TracedTaskCommon::TracedTaskCommon()
   : mSourceEventId(0)
-  , mSourceEventType(SourceEventType::UNKNOWN)
+  , mSourceEventType(SourceEventType::Unknown)
 {
   Init();
 }
@@ -52,7 +52,7 @@ TracedTaskCommon::ClearTraceInfo()
   }
 
   info->mCurTraceSourceId = 0;
-  info->mCurTraceSourceType = SourceEventType::UNKNOWN;
+  info->mCurTraceSourceType = SourceEventType::Unknown;
   info->mCurTaskId = 0;
 }