Bug 726043 - Rev uuids for bug 294260 and add NS_ENSURE_ARG_POINTER. r=Mossop
authorMatthew Noorenberghe <mozilla@noorenberghe.ca>
Fri, 10 Feb 2012 12:07:19 -0800
changeset 89729 c7423cda433c3b978726f328ba2911754261571c
parent 89728 94cd5a4d7a103bd1cba6ce394b4c8d8392534a64
child 89730 d689f4d7e7ead259424140904fad429807109475
push id783
push userlsblakk@mozilla.com
push dateTue, 24 Apr 2012 17:33:42 +0000
treeherdermozilla-beta@11faed19f136 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMossop
bugs726043, 294260
milestone13.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 726043 - Rev uuids for bug 294260 and add NS_ENSURE_ARG_POINTER. r=Mossop
browser/components/search/test/testEngine_mozsearch.xml
toolkit/components/startup/nsAppStartup.cpp
toolkit/components/startup/public/nsIAppStartup.idl
toolkit/profile/nsIToolkitProfile.idl
xpcom/system/nsIXULRuntime.idl
--- a/toolkit/components/startup/nsAppStartup.cpp
+++ b/toolkit/components/startup/nsAppStartup.cpp
@@ -817,18 +817,20 @@ nsAppStartup::GetStartupInfo(JSContext* 
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAppStartup::GetAutomaticSafeModeNecessary(bool *_retval)
 {
-    *_retval = mIsSafeModeNecessary;
-    return NS_OK;
+  NS_ENSURE_ARG_POINTER(_retval);
+
+  *_retval = mIsSafeModeNecessary;
+  return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAppStartup::TrackStartupCrashBegin(bool *aIsSafeModeNecessary)
 {
   const PRInt32 MAX_TIME_SINCE_STARTUP = 6 * 60 * 60 * 1000;
   const PRInt32 MAX_STARTUP_BUFFER = 10;
   nsresult rv;
--- a/toolkit/components/startup/public/nsIAppStartup.idl
+++ b/toolkit/components/startup/public/nsIAppStartup.idl
@@ -36,17 +36,17 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsISupports.idl"
 
 interface nsICmdLineService;
 
-[scriptable, uuid(dd3e7b3c-0974-4a38-b4d3-ce2213452432)]
+[scriptable, uuid(50c4194b-61c6-4292-963f-6e1a8e11c9d3)]
 interface nsIAppStartup : nsISupports
 {
     /**
      * Create the hidden window.
      */
     void createHiddenWindow();
 
     /**
--- a/toolkit/profile/nsIToolkitProfile.idl
+++ b/toolkit/profile/nsIToolkitProfile.idl
@@ -40,17 +40,17 @@
 interface nsILocalFile;
 interface nsIToolkitProfile;
 interface nsIProfileUnlocker;
 
 /**
  * Hold on to a profile lock. Once you release the last reference to this
  * interface, the profile lock is released.
  */
-[scriptable, uuid(50e07b0a-f338-4da3-bcdb-f4bb0db94dbe)]
+[scriptable, uuid(7c58c703-d245-4864-8d75-9648ca4a6139)]
 interface nsIProfileLock : nsISupports
 {
     /**
      * The main profile directory.
      */
     readonly attribute nsILocalFile directory;
     
     /**
--- a/xpcom/system/nsIXULRuntime.idl
+++ b/xpcom/system/nsIXULRuntime.idl
@@ -39,17 +39,17 @@
 
 /**
  * Provides information about the XUL runtime.
  * @status UNSTABLE - This interface is not frozen and will probably change in
  *                    future releases. If you need this functionality to be
  *                    stable/frozen, please contact Benjamin Smedberg.
  */
 
-[scriptable, uuid(7685dac8-3637-4660-a544-928c5ec0e714)]
+[scriptable, uuid(cb0b8eda-4c83-4d0e-a63c-d3b65714bc85)]
 interface nsIXULRuntime : nsISupports
 {
   /**
    * Whether the application was launched in safe mode.
    */
   readonly attribute boolean inSafeMode;
 
   /**