Bug 1518639: Remove unused arguments for CheckDowngrade. r=froydnj
authorDave Townsend <dtownsend@oxymoronical.com>
Tue, 12 Feb 2019 20:14:41 +0000
changeset 458794 827f76ed2ca7404ce5efbd01d46bd089cad2440e
parent 458793 be5bd597747afe360b14fd53453f6a35f920bd09
child 458795 6277132ebaddfa1fe7e5d451259632896a67a49b
push id35548
push useropoprus@mozilla.com
push dateWed, 13 Feb 2019 09:48:26 +0000
treeherdermozilla-central@93e37c529818 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1518639
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1518639: Remove unused arguments for CheckDowngrade. r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D19415
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2408,18 +2408,16 @@ static void SubmitDowngradeTelemetry(con
   process->Run(false, args, 2);
 #  endif
 }
 
 static const char kProfileDowngradeURL[] =
     "chrome://mozapps/content/profile/profileDowngrade.xul";
 
 static ReturnAbortOnError CheckDowngrade(nsIFile* aProfileDir,
-                                         nsIFile* aProfileLocalDir,
-                                         nsACString& aProfileName,
                                          nsINativeAppSupport* aNative,
                                          nsIToolkitProfileService* aProfileSvc,
                                          const nsCString& aLastVersion) {
   int32_t result = 0;
   nsresult rv;
 
   {
     if (gfxPlatform::IsHeadless()) {
@@ -4235,18 +4233,17 @@ int XREMain::XRE_mainStartup(bool* aExit
   bool isDowngrade;
   nsCString lastVersion;
   bool versionOK = CheckCompatibility(
       mProfD, version, osABI, mDirProvider.GetGREDir(), mAppData->directory,
       flagFile, &cachesOK, &isDowngrade, lastVersion);
 
 #ifdef MOZ_BLOCK_PROFILE_DOWNGRADE
   if (isDowngrade && !CheckArg("allow-downgrade")) {
-    rv = CheckDowngrade(mProfD, mProfLD, mProfileName, mNativeApp, mProfileSvc,
-                        lastVersion);
+    rv = CheckDowngrade(mProfD, mNativeApp, mProfileSvc, lastVersion);
     if (rv == NS_ERROR_LAUNCHED_CHILD_PROCESS || rv == NS_ERROR_ABORT) {
       *aExitFlag = true;
       return 0;
     }
   }
 #endif
 
   rv = mDirProvider.SetProfile(mProfD, mProfLD);