Backed out changeset 905e3a9f7557 (bug 1153978) for xpcshell test failure. CLOSED TREE

--HG--
extra : amend_source : b8e2e8de5140313da0e2f52c4d9d46e4b609b6cd

toolkit/xre/nsAppRunner.cpp

@@ -68,7 +68,6 @@
 #include "nsIIOService2.h"
 #include "nsIObserverService.h"
 #include "nsINativeAppSupport.h"
-#include "nsIPlatformInfo.h"
 #include "nsIProcess.h"
 #include "nsIProfileUnlocker.h"
 #include "nsIPromptService.h"
@@ -742,7 +741,6 @@ class nsXULAppInfo : public nsIXULAppInfo,
 public:
   MOZ_CONSTEXPR nsXULAppInfo() {}
   NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIPLATFORMINFO
   NS_DECL_NSIXULAPPINFO
   NS_DECL_NSIXULRUNTIME
   NS_DECL_NSIOBSERVER
@@ -766,8 +764,7 @@ NS_INTERFACE_MAP_BEGIN(nsXULAppInfo)
   NS_INTERFACE_MAP_ENTRY(nsICrashReporter)
   NS_INTERFACE_MAP_ENTRY(nsIFinishDumpingCallback)
 #endif
-  NS_INTERFACE_MAP_ENTRY(nsIPlatformInfo)
-  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIXULAppInfo, gAppData ||
+  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIXULAppInfo, gAppData || 
                                      XRE_IsContentProcess())
 NS_INTERFACE_MAP_END
 

xpcom/system/moz.build

@@ -14,7 +14,6 @@ XPIDL_SOURCES += [
     'nsIGSettingsService.idl',
     'nsIHapticFeedback.idl',
     'nsIPackageKitService.idl',
-    'nsIPlatformInfo.idl',
     'nsIXULAppInfo.idl',
     'nsIXULRuntime.idl',
 ]

xpcom/system/nsIPlatformInfo.idl

@@ -1,19 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(ab6650cf-0806-4aea-b8f2-40fdae74f1cc)]
-interface nsIPlatformInfo : nsISupports
-{
-  /**
-   * The version of the XULRunner platform.
-   */
-  readonly attribute ACString platformVersion;
-
-  /**
-   * The build ID/date of gecko and the XULRunner platform.
-   */
-  readonly attribute ACString platformBuildID;
-};

xpcom/system/nsIXULAppInfo.idl

@@ -2,15 +2,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsIPlatformInfo.idl"
+#include "nsISupports.idl"
 
 /**
  * A scriptable interface to the nsXULAppAPI structure. See nsXULAppAPI.h for
  * a detailed description of each attribute.
  */
 
-[scriptable, uuid(ddea4f31-3c5e-4769-ac68-21ab4b3d7845)]
-interface nsIXULAppInfo : nsIPlatformInfo
+[scriptable, uuid(1518e7d2-022a-4dae-b02e-bbe7ffcf2145)]
+interface nsIXULAppInfo : nsISupports
 {
   /**
    * @see nsXREAppData.vendor
@@ -45,6 +45,16 @@ interface nsIXULAppInfo : nsIPlatformInfo
    */
   readonly attribute ACString appBuildID;
 
+  /**
+   * The version of the XULRunner platform.
+   */
+  readonly attribute ACString platformVersion;
+
+  /**
+   * The build ID/date of gecko and the XULRunner platform.
+   */
+  readonly attribute ACString platformBuildID;
+  
   /**
    * @see nsXREAppData.UAName
    * @returns an empty string if nsXREAppData.UAName is not set.