b=175320 Support clean profile & NSS shutdown at any time + Mozilla needs to clean up on exit to allow for PSM failure detection

r=ccarlen/morse sr=darin

extensions/cookie/nsCookieService.cpp

@@ -215,16 +215,10 @@ NS_IMETHODIMP nsCookieService::Observe(nsISupports *aSubject, const char *aTopic
   nsresult rv = NS_OK;
 
   if (!nsCRT::strcmp(aTopic, "profile-before-change")) {
-    // The profile is about to change.
+    // The profile is about to change,
+    // or is going away because the application is shutting down.
     
-    // Dump current cookies.  This will be done by calling 
-    // COOKIE_RemoveAll which clears the memory-resident
-    // cookie table.  The reason the cookie file does not
-    // need to be updated is because the file was updated every time
-    // the memory-resident table changed (i.e., whenever a new cookie
-    // was accepted).  If this condition ever changes, the cookie
-    // file would need to be updated here.
-
+    COOKIE_Write(mDir);
     COOKIE_RemoveAll();
     if (!nsCRT::strcmp(someData, NS_LITERAL_STRING("shutdown-cleanse").get()))
       COOKIE_DeletePersistentUserData();
@@ -232,9 +226,6 @@ NS_IMETHODIMP nsCookieService::Observe(nsISupports *aSubject, const char *aTopic
     // The profile has aleady changed.    
     // Now just read them from the new profile location.
     COOKIE_Read();
-  } else if (!nsCRT::strcmp(aTopic, "xpcom-shutdown")) {
-    // Leaving browser, need to save cookies
-    COOKIE_Write(mDir);
   } else if (!nsCRT::strcmp(aTopic, "cookieIcon")) {
     gCookieIconVisible = (!nsCRT::strcmp(someData, NS_LITERAL_STRING("on").get()));
   }

profile/public/nsIProfileChangeStatus.idl

@@ -56,7 +56,17 @@
     *
     * "profile-change-teardown"
     *   All async activity must be stopped in this phase. Typically,
-    *   the application level observer will close all open windows. 
+    *   the application level observer will close all open windows.
+    *   This is the last phase in which the subject's vetoChange()
+    *   method may still be called. 
+    *   The next notification will be either 
+    *   profile-change-teardown-veto or profile-before-change.
+    *
+    * "profile-change-teardown-veto"
+    *   This notification will only be sent, if the profile change 
+    *   was vetoed during the profile-change-teardown phase.
+    *   This allows components to bring back required resources,
+    *   that were tore down on profile-change-teardown.
     *
     * "profile-before-change"
     *   Called before the profile has changed. Use this notification

profile/src/nsProfile.cpp

@@ -247,6 +247,8 @@ nsProfile::nsProfile()
 
     mIsUILocaleSpecified = PR_FALSE;
     mIsContentLocaleSpecified = PR_FALSE;
+    
+    mShutdownProfileToreDownNetwork = PR_FALSE;
 }
 
 nsProfile::~nsProfile() 
@@ -1171,9 +1173,19 @@ nsProfile::SetCurrentProfile(const PRUnichar * aCurrentProfile)
 
         // Phase 2a: Send the network teardown notification
         observerService->NotifyObservers(subject, "profile-change-net-teardown", context.get());
+        mShutdownProfileToreDownNetwork = PR_TRUE;
 
         // Phase 2b: Send the "teardown" notification
         observerService->NotifyObservers(subject, "profile-change-teardown", context.get());
+        if (mProfileChangeVetoed)
+        {
+            // Notify we will not proceed with changing the profile
+            observerService->NotifyObservers(subject, "profile-change-teardown-veto", context.get());
+
+            // Bring network back online and return
+            observerService->NotifyObservers(subject, "profile-change-net-restore", context.get());
+            return NS_OK;
+        }
         
         // Phase 3: Notify observers of a profile change
         observerService->NotifyObservers(subject, "profile-before-change", context.get());        
@@ -1192,12 +1204,7 @@ nsProfile::SetCurrentProfile(const PRUnichar * aCurrentProfile)
     if (NS_FAILED(rv)) return rv;
     mCurrentProfileAvailable = PR_TRUE;
     
-    if (isSwitch)
-    {
-        // Bring network back online
-        observerService->NotifyObservers(subject, "profile-change-net-restore", context.get());
-    }
-    else
+    if (!isSwitch)
     {
         // Ensure that the prefs service exists so it can respond to
         // the notifications we're about to send around. It needs to.
@@ -1205,6 +1212,13 @@ nsProfile::SetCurrentProfile(const PRUnichar * aCurrentProfile)
         NS_ASSERTION(NS_SUCCEEDED(rv), "Could not get prefs service");
     }
 
+    if (mShutdownProfileToreDownNetwork)
+    {
+        // Bring network back online
+        observerService->NotifyObservers(subject, "profile-change-net-restore", context.get());
+        mShutdownProfileToreDownNetwork = PR_FALSE;
+    }
++
     // Phase 4: Notify observers that the profile has changed - Here they respond to new profile
     observerService->NotifyObservers(subject, "profile-do-change", context.get());
 
@@ -1259,7 +1273,11 @@ NS_IMETHODIMP nsProfile::ShutDownCurrentProfile(PRUint32 shutDownType)
       if (mProfileChangeVetoed)
         return NS_OK;
       
-      // Phase 2: Send the "teardown" notification
+      // Phase 2a: Send the network teardown notification
+      observerService->NotifyObservers(subject, "profile-change-net-teardown", context.get());
+      mShutdownProfileToreDownNetwork = PR_TRUE;
+
+      // Phase 2b: Send the "teardown" notification
       observerService->NotifyObservers(subject, "profile-change-teardown", context.get());
       
       // Phase 3: Notify observers of a profile change

profile/src/nsProfile.h

@@ -102,6 +102,8 @@ private:
     PRBool mIsContentLocaleSpecified;
     nsCString mContentLocaleName;
     
+    PRBool mShutdownProfileToreDownNetwork;
+    
 public:
     nsProfile();
     virtual ~nsProfile();

xpfe/bootstrap/nsAppRunner.cpp

@@ -875,8 +875,7 @@ static nsresult DoOnShutdown()
     nsCOMPtr<nsIProfile> profileMgr(do_GetService(NS_PROFILE_CONTRACTID, &rv));
     NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get profile manager, so unable to update last modified time");
     if (NS_SUCCEEDED(rv)) {
-      // 0 is undefined, we use this secret value so that we don't notify
-      profileMgr->ShutDownCurrentProfile(0);
+      profileMgr->ShutDownCurrentProfile(nsIProfile::SHUTDOWN_PERSIST);
     }
   }