Bug 522375: fix non-libxul builds + testcase nits from gavin. a=bustage,tests

browser/components/sessionstore/test/browser/browser_522375.js

@@ -1,13 +1,11 @@
 function test() {
-  waitForExplicitFinish();
   var startup_info = Components.classes["@mozilla.org/toolkit/app-startup;1"].getService(Components.interfaces.nsIAppStartup_MOZILLA_2_0).getStartupInfo();
   // No .process info on mac
-  is(startup_info.process <= startup_info.main, true, "process created before main is run " + uneval(startup_info));
+  ok(startup_info.process <= startup_info.main, "process created before main is run " + uneval(startup_info));
 
   // on linux firstPaint can happen after everything is loaded (especially with remote X)
   if (startup_info.firstPaint)
-    is(startup_info.main <= startup_info.firstPaint, true, "main ran before first paint " + uneval(startup_info));
+    ok(startup_info.main <= startup_info.firstPaint, "main ran before first paint " + uneval(startup_info));
 
-  is(startup_info.main < startup_info.sessionRestored, true, "Session restored after main " + uneval(startup_info));
-  finish();
+  ok(startup_info.main < startup_info.sessionRestored, "Session restored after main " + uneval(startup_info));
 }

toolkit/components/startup/src/nsAppStartup.cpp

@@ -90,8 +90,10 @@
 #endif
 
 static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
+#ifdef MOZ_ENABLE_LIBXUL
 extern PRTime gXRE_mainTimestamp;
 extern PRTime gFirstPaintTimestamp;
+#endif
 // mfinklesessionstore-browser-state-restored might be a better choice than the one below
 static PRTime gRestoredTimestamp = 0;       // Timestamp of sessionstore-windows-restored
 static PRTime gProcessCreationTimestamp = 0;// Timestamp of sessionstore-windows-restored
@@ -685,8 +687,10 @@ nsAppStartup::GetStartupInfo()
     gProcessCreationTimestamp = CalculateProcessCreationTimestamp();
 
   MaybeDefineProperty(cx, obj, "process", gProcessCreationTimestamp);
+#ifdef MOZ_ENABLE_LIBXUL
   MaybeDefineProperty(cx, obj, "main", gXRE_mainTimestamp);
   MaybeDefineProperty(cx, obj, "firstPaint", gFirstPaintTimestamp);
+#endif
   MaybeDefineProperty(cx, obj, "sessionRestored", gRestoredTimestamp);
   return NS_OK;
 }