Bug 1544868 - Remove network predictor code and network.predictor.cleaned-up preference r=valentin

Differential Revision: https://phabricator.services.mozilla.com/D68341

--HG--
extra : moz-landing-system : lando

modules/libpref/docs/index.md

@@ -11,7 +11,7 @@ that encompasses a variety of things.
 - Things that might need locking in an enterprise installation.
 - Application data (e.g.
   `browser.onboarding.tour.onboarding-tour-addons.completed`,
-  `services.sync.clients.lastSync`, `network.predictor.cleaned-up`).
+  `services.sync.clients.lastSync`).
 - A cheap and dirty form of IPC(!) (some devtools prefs).
 
 Some of these (particularly the last two) are not an ideal use of libpref.

modules/libpref/init/StaticPrefList.yaml

@@ -7392,12 +7392,7 @@
   type: uint32_t
   value: 500
   mirror: always
-
-- name: network.predictor.cleaned-up
-  type: bool
-  value: false
-  mirror: never
-
+  
 # A testing flag.
 - name: network.predictor.doing-tests
   type: bool

netwerk/base/Predictor.cpp

@@ -66,8 +66,6 @@ static LazyLogModule gPredictorLog("NetworkPredictor");
 
 #define NOW_IN_SECONDS() static_cast<uint32_t>(PR_Now() / PR_USEC_PER_SEC)
 
-static const char PREDICTOR_CLEANED_UP_PREF[] = "network.predictor.cleaned-up";
-
 // All these time values are in sec
 static const uint32_t ONE_DAY = 86400U;
 static const uint32_t ONE_WEEK = 7U * ONE_DAY;
@@ -243,7 +241,6 @@ NS_IMPL_ISUPPORTS(Predictor, nsINetworkPredictor, nsIObserver,
 
 Predictor::Predictor()
     : mInitialized(false),
-      mCleanedUp(false),
       mStartupTime(0),
       mLastStartupTime(0),
       mStartupCount(1) {
@@ -271,13 +268,6 @@ nsresult Predictor::InstallObserver() {
   rv = obs->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mCleanedUp = Preferences::GetBool(PREDICTOR_CLEANED_UP_PREF, false);
-
-  if (!mCleanedUp) {
-    NS_NewTimerWithObserver(getter_AddRefs(mCleanupTimer), this, 60 * 1000,
-                            nsITimer::TYPE_ONE_SHOT);
-  }
-
   return rv;
 }
 
@@ -288,11 +278,6 @@ void Predictor::RemoveObserver() {
   if (obs) {
     obs->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
   }
-
-  if (mCleanupTimer) {
-    mCleanupTimer->Cancel();
-    mCleanupTimer = nullptr;
-  }
 }
 
 NS_IMETHODIMP
@@ -304,9 +289,6 @@ Predictor::Observe(nsISupports* subject, const char* topic,
 
   if (!strcmp(NS_XPCOM_SHUTDOWN_OBSERVER_ID, topic)) {
     Shutdown();
-  } else if (!strcmp("timer-callback", topic)) {
-    MaybeCleanupOldDBFiles();
-    mCleanupTimer = nullptr;
   }
 
   return rv;
@@ -419,57 +401,6 @@ nsresult Predictor::Init() {
 }
 
 namespace {
-class PredictorOldCleanupRunner : public Runnable {
- public:
-  explicit PredictorOldCleanupRunner(nsIFile* dbFile)
-      : Runnable("net::PredictorOldCleanupRunner"), mDBFile(dbFile) {}
-
-  ~PredictorOldCleanupRunner() = default;
-
-  NS_IMETHOD Run() override {
-    MOZ_ASSERT(!NS_IsMainThread(), "Cleaning up old files on main thread!");
-    nsresult rv = CheckForAndDeleteOldDBFiles();
-
-    if (NS_SUCCEEDED(rv)) {
-      NS_DispatchToMainThread(NS_NewRunnableFunction(
-          "net::PredictorOldCleanupMainThread",
-          []() { Preferences::SetBool(PREDICTOR_CLEANED_UP_PREF, true); }));
-    }
-    return NS_OK;
-  }
-
- private:
-  nsresult CheckForAndDeleteOldDBFiles() {
-    nsCOMPtr<nsIFile> oldDBFile;
-    nsresult rv = mDBFile->GetParent(getter_AddRefs(oldDBFile));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = oldDBFile->AppendNative(NS_LITERAL_CSTRING("seer.sqlite"));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    bool fileExists = false;
-    rv = oldDBFile->Exists(&fileExists);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    if (fileExists) {
-      rv = oldDBFile->Remove(false);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-
-    fileExists = false;
-    rv = mDBFile->Exists(&fileExists);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    if (fileExists) {
-      rv = mDBFile->Remove(false);
-    }
-
-    return rv;
-  }
-
-  nsCOMPtr<nsIFile> mDBFile;
-};
-
 class PredictorLearnRunnable final : public Runnable {
  public:
   PredictorLearnRunnable(nsIURI* targetURI, nsIURI* sourceURI,
@@ -509,29 +440,6 @@ class PredictorLearnRunnable final : public Runnable {
 
 }  // namespace
 
-void Predictor::MaybeCleanupOldDBFiles() {
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (!StaticPrefs::network_predictor_enabled() || mCleanedUp) {
-    return;
-  }
-
-  mCleanedUp = true;
-
-  // This is used for cleaning up junk left over from the old backend
-  // built on top of sqlite, if necessary.
-  nsCOMPtr<nsIFile> dbFile;
-  nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
-                                       getter_AddRefs(dbFile));
-  NS_ENSURE_SUCCESS_VOID(rv);
-  rv = dbFile->AppendNative(NS_LITERAL_CSTRING("netpredictions.sqlite"));
-  NS_ENSURE_SUCCESS_VOID(rv);
-
-  RefPtr<PredictorOldCleanupRunner> runner =
-      new PredictorOldCleanupRunner(dbFile);
-  NS_DispatchBackgroundTask(runner.forget());
-}
-
 void Predictor::Shutdown() {
   if (!NS_IsMainThread()) {
     MOZ_ASSERT(false, "Predictor::Shutdown called off the main thread!");

netwerk/base/Predictor.h

@@ -429,9 +429,6 @@ class Predictor final : public nsINetworkPredictor,
   // Our state
   bool mInitialized;
 
-  bool mCleanedUp;
-  nsCOMPtr<nsITimer> mCleanupTimer;
-
   nsTArray<nsCString> mKeysToOperateOn;
   nsTArray<nsCString> mValuesToOperateOn;
 

netwerk/test/unit/test_predictor.js

@@ -740,7 +740,6 @@ function run_test_real() {
   do_get_profile();
 
   Services.prefs.setBoolPref("network.predictor.enabled", true);
-  Services.prefs.setBoolPref("network.predictor.cleaned-up", true);
   Services.prefs.setBoolPref("network.predictor.doing-tests", true);
 
   predictor = Cc["@mozilla.org/network/predictor;1"].getService(
@@ -752,7 +751,6 @@ function run_test_real() {
   registerCleanupFunction(() => {
     Services.prefs.clearUserPref("network.predictor.preconnect-min-confidence");
     Services.prefs.clearUserPref("network.predictor.enabled");
-    Services.prefs.clearUserPref("network.predictor.cleaned-up");
     Services.prefs.clearUserPref("network.predictor.preresolve-min-confidence");
     Services.prefs.clearUserPref("network.predictor.enable-prefetch");
     Services.prefs.clearUserPref(