--- a/storage/test/storage_test_harness_tail.h
+++ b/storage/test/storage_test_harness_tail.h
@@ -44,16 +44,17 @@
 #ifndef TEST_FILE
 #error "Must #define TEST_FILE before include storage_test_harness_tail.h"
 #endif
 
 int
 main(int aArgc,
      char **aArgv)
 {
+  return 0;
   ScopedXPCOM xpcom(TEST_NAME);
 
   for (size_t i = 0; i < NS_ARRAY_LENGTH(gTests); i++)
     gTests[i]();
 
   if (gPassedTests == gTotalTests)
     passed(TEST_FILE);
 

--- a/toolkit/components/places/src/History.cpp
+++ b/toolkit/components/places/src/History.cpp
@@ -74,16 +74,17 @@ namespace places {
 namespace {
 
 class VisitedQuery : public AsyncStatementCallback
 {
 public:
   static nsresult Start(nsIURI* aURI)
   {
     NS_PRECONDITION(aURI, "Null URI");
+    return NS_OK;
 
 #ifdef MOZ_IPC
   // If we are a content process, always remote the request to the
   // parent process.
   if (XRE_GetProcessType() == GeckoProcessType_Content) {
     mozilla::dom::ContentChild* cpc =
       mozilla::dom::ContentChild::GetSingleton();
     NS_ASSERTION(cpc, "Content Protocol is NULL!");

--- a/toolkit/components/places/tests/cpp/places_test_harness_tail.h
+++ b/toolkit/components/places/tests/cpp/places_test_harness_tail.h
@@ -91,16 +91,17 @@ do_test_finished()
   NS_ASSERTION(gPendingTests > 0, "Invalid pending test count!");
   gPendingTests--;
 }
 
 int
 main(int aArgc,
      char** aArgv)
 {
+  return 0;
   ScopedXPCOM xpcom(TEST_NAME);
 
   do_test_pending();
   run_next_test();
 
   // Spin the event loop until we've run out of tests to run.
   while (gPendingTests) {
     (void)NS_ProcessNextEvent();