Bug 792180 - Replace NS_{UN,}LIKELY with MOZ_{UN,}LIKELY; r=ehsan

layout/generic/nsInlineFrame.cpp

@@ -19,6 +19,7 @@
 #include "nsAutoPtr.h"
 #include "nsFrameManager.h"
 #include "nsDisplayList.h"
+#include "mozilla/Likely.h"
 
 #ifdef DEBUG
 #undef NOISY_PUSHING
@@ -506,7 +507,7 @@ nsInlineFrame::ReflowFrames(nsPresContext* aPresContext,
         // This scenario doesn't happen often, but it can happen.
         nsIFrame* nextSibling = child->GetNextSibling();
         child = child->GetNextInFlow();
-        if (NS_UNLIKELY(child)) {
+        if (MOZ_UNLIKELY(child)) {
           while (child != nextSibling && nextSibling) {
             nextSibling = nextSibling->GetNextSibling();
           }