Backed out changeset 9b04f5fd79d6 (bug 836654)

hal/HalTypes.h

@@ -13,9 +13,7 @@ namespace mozilla {
 namespace hal {
 
 /**
- * These constants specify special values for content process IDs.  You can get
+ * XXX
- * a content process ID by calling ContentChild::GetID() or
- * ContentParent::GetChildID().
  */
 const uint64_t CONTENT_PROCESS_ID_UNKNOWN = uint64_t(-1);
 const uint64_t CONTENT_PROCESS_ID_MAIN = 0;

hal/sandbox/SandboxHal.cpp

@@ -281,7 +281,7 @@ ModifyWakeLock(const nsAString &aTopic,
                WakeLockControl aHiddenAdjust,
                uint64_t aProcessID)
 {
-  MOZ_ASSERT(aProcessID != CONTENT_PROCESS_ID_UNKNOWN);
+  MOZ_ASSERT(aProcessID != ContentChild::kUnknownID);
   Hal()->SendModifyWakeLock(nsString(aTopic), aLockAdjust, aHiddenAdjust, aProcessID);
 }
 
@@ -713,7 +713,7 @@ public:
                      const WakeLockControl& aHiddenAdjust,
                      const uint64_t& aProcessID) MOZ_OVERRIDE
   {
-    MOZ_ASSERT(aProcessID != CONTENT_PROCESS_ID_UNKNOWN);
+    MOZ_ASSERT(aProcessID != ContentChild::kUnknownID);
 
     // We allow arbitrary content to use wake locks.
     hal::ModifyWakeLock(aTopic, aLockAdjust, aHiddenAdjust, aProcessID);