Bug 770883 - Disable functionality for clearing prefetch. r=taras

browser/components/shell/src/nsWindowsShellService.cpp

@@ -194,6 +194,8 @@ static SETTING gDDESettings[] = {
   { MAKE_KEY_NAME1("Software\\Classes\\HTTPS", SOD) }
 };
 
+// See Bug 770883
+#if 0
 #if defined(MOZ_MAINTENANCE_SERVICE)
 
 #define ONLY_SERVICE_LAUNCHING
@@ -204,6 +206,7 @@ static const char *kPrefetchClearedPref =
   "app.update.service.lastVersionPrefetchCleared";
 static nsCOMPtr<nsIThread> sThread;
 #endif
+#endif
 
 nsresult
 GetHelperPath(nsAutoString& aPath)
@@ -997,6 +1000,8 @@ nsWindowsShellService::SetDesktopBackgroundColor(PRUint32 aColor)
 nsWindowsShellService::nsWindowsShellService() : 
   mCheckedThisSession(false) 
 {
+// See Bug 770883
+#if 0
 #if defined(MOZ_MAINTENANCE_SERVICE)
 
   // Check to make sure the service is installed
@@ -1041,10 +1046,13 @@ nsWindowsShellService::nsWindowsShellService() :
       nsnull, CLEAR_PREFETCH_TIMEOUT_MS, nsITimer::TYPE_ONE_SHOT);
   }
 #endif
+#endif
 }
 
 nsWindowsShellService::~nsWindowsShellService()
 {
+// See Bug 770883
+#if 0
 #if defined(MOZ_MAINTENANCE_SERVICE)
  if (mTimer) {
     mTimer->Cancel();
@@ -1055,8 +1063,11 @@ nsWindowsShellService::~nsWindowsShellService()
     sThread = nsnull;
   }
 #endif
+#endif
 }
 
+// See Bug 770883
+#if 0
 #if defined(MOZ_MAINTENANCE_SERVICE)
 
 class ClearPrefetchEvent : public nsRunnable {
@@ -1079,6 +1090,7 @@ public:
   }
 };
 #endif
+#endif
 
 /**
  * For faster startup we attempt to clear the prefetch if the maintenance
@@ -1089,6 +1101,8 @@ public:
  * This is done on every update but also there is a one time operation done
  * from within the program for first time installs.
  */ 
+// See Bug 770883
+#if 0
 #if defined(MOZ_MAINTENANCE_SERVICE)
 void
 nsWindowsShellService::LaunchPrefetchClearCommand(nsITimer *aTimer, void*)
@@ -1113,6 +1127,7 @@ nsWindowsShellService::LaunchPrefetchClearCommand(nsITimer *aTimer, void*)
   }
 }
 #endif
+#endif
 
 NS_IMETHODIMP
 nsWindowsShellService::OpenApplicationWithURI(nsIFile* aApplication,

toolkit/components/maintenanceservice/workmonitor.cpp

@@ -504,9 +504,14 @@ ExecuteServiceCommand(int argc, LPWSTR *argv)
     // because the service self updates itself and the service
     // installer will stop the service.
     LOG(("Service command %ls complete.\n", argv[2]));
-  } else if (!lstrcmpi(argv[2], L"clear-prefetch")) {
+  }
+  // See Bug 770883
+#if 0
+  else if (!lstrcmpi(argv[2], L"clear-prefetch")) {
     result = ClearKnownPrefetch();
-  } else {
+  } 
+#endif
+  else {
     LOG(("Service command not recognized: %ls.\n", argv[2]));
     // result is already set to FALSE
   }