Bug 828126 - Enable ifdef'd code on Fennec now that dependent bugs have been fixed. r=avih

dom/base/nsDOMWindowUtils.cpp

@@ -2195,10 +2195,10 @@ nsDOMWindowUtils::StopFrameTimeRecording(float** paintTimes, uint32_t *frameCoun
     /* copy over the frame intervals and paint times into the arrays we just allocated */
     for (uint32_t i = 0; i < *frameCount; i++) {
       (*frameIntervals)[i] = tmpFrameIntervals[i];
-#ifndef ANDROID
+#ifndef MOZ_WIDGET_GONK
       (*paintTimes)[i] = tmpPaintTimes[i];
 #else
-      // Waiting for bug 785597 to work on android.
+      // Waiting for bug 830475 to work on B2G.
       (*paintTimes)[i] = 0;
 #endif
     }

layout/base/nsRefreshDriver.cpp

@@ -942,8 +942,8 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
 #ifdef DEBUG_INVALIDATIONS
     printf("Starting ProcessPendingUpdates\n");
 #endif
-#ifndef ANDROID
-    // Waiting for bug 785597 to work on android.
+#ifndef MOZ_WIDGET_GONK
+    // Waiting for bug 830475 to work on B2G.
     nsRefPtr<layers::LayerManager> mgr = mPresContext->GetPresShell()->GetLayerManager();
     if (mgr) {
       mgr->SetPaintStartTime(mMostRecentRefresh);