Revert "No Issue - Hardcode XAI.platformVersion to 52.9.0 and add XAI.greVersion as the actual version"

This reverts commit 0c2396808491278981bec84e8998b29ec19d297d.

2 files changed, 1 insertions, 16 deletions

diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
index 45c47f1f8..8d94a1545 100644
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -465,7 +465,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
   NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
   NS_NAMED_LITERAL_STRING(kApplication, "application");
   NS_NAMED_LITERAL_STRING(kAppVersion, "appversion");
-  NS_NAMED_LITERAL_STRING(kGoannaVersion, "greversion");
   NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion");
   NS_NAMED_LITERAL_STRING(kOs, "os");
   NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
@@ -480,7 +479,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
 
   nsAutoString appID;
   nsAutoString appVersion;
-  nsAutoString goannaVersion;
   nsAutoString geckoVersion;
   nsAutoString osTarget;
   nsAutoString abi;
@@ -504,11 +502,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
       CopyUTF8toUTF16(s, appVersion);
     }
 
-    rv = xapp->GetGreVersion(s);
-    if (NS_SUCCEEDED(rv)) {
-      CopyUTF8toUTF16(s, goannaVersion);
-    }
-
     rv = xapp->GetPlatformVersion(s);
     if (NS_SUCCEEDED(rv)) {
       CopyUTF8toUTF16(s, geckoVersion);
@@ -641,7 +634,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
 
     bool ok = true;
     TriState stAppVersion = eUnspecified;
-    TriState stGoannaVersion = eUnspecified;
     TriState stGeckoVersion = eUnspecified;
     TriState stApp = eUnspecified;
     TriState stOsVersion = eUnspecified;
@@ -662,7 +654,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
           CheckStringFlag(kProcess, wtoken, process, stProcess) ||
           CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
           CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
-          CheckVersionFlag(kGoannaVersion, wtoken, goannaVersion, stGoannaVersion) ||
           CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) {
         continue;
       }
@@ -708,7 +699,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
     if (!ok ||
         stApp == eBad ||
         stAppVersion == eBad ||
-        stGoannaVersion == eBad ||
         stGeckoVersion == eBad ||
         stOs == eBad ||
         stOsVersion == eBad ||
diff --git a/xpcom/system/nsIPlatformInfo.idl b/xpcom/system/nsIPlatformInfo.idl
index 24d5d5dc9..fba78b6ec 100644
--- a/xpcom/system/nsIPlatformInfo.idl
+++ b/xpcom/system/nsIPlatformInfo.idl
@@ -4,15 +4,10 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(2d4202b9-4d2f-46f1-bb6a-e9a117dff66c)]
+[scriptable, uuid(ab6650cf-0806-4aea-b8f2-40fdae74f1cc)]
 interface nsIPlatformInfo : nsISupports
 {
   /**
-   * The /true/ version of the Goanna Runtime Environment.
-   */
-  readonly attribute ACString greVersion;
-
-  /**
    * The version of the XULRunner platform.
    */
   readonly attribute ACString platformVersion;