Bug 235168 Remove MOZ_PHOENIX ifdefs from strictly firefox or strictly seamonkey code

patch by sdwalker@myrealbox.com r=ben sr=roc

browser/components/bookmarks/src/nsBookmarksService.cpp

@@ -2357,12 +2357,10 @@ NS_IMETHODIMP nsBookmarksService::Observe(nsISupports *aSubject, const char *aTo
         // The profile has aleady changed.
         rv = LoadBookmarks();
     }
-#ifdef MOZ_PHOENIX
     else if (!nsCRT::strcmp(aTopic, "quit-application"))
     {
         rv = Flush();
     }
-#endif
 
     return rv;
 }

toolkit/components/history/src/nsGlobalHistory.cpp

@@ -2003,14 +2003,12 @@ nsGlobalHistory::Unassert(nsIRDFResource* aSource,
     rv = RemovePage(targetUrl);
     if (NS_FAILED(rv)) return NS_RDF_ASSERTION_REJECTED;
 
-#ifdef MOZ_PHOENIX
     if (!mBatchesInProgress && IsFindResource(aSource)) {
       // if there are batches in progress, we don't want to notify
       // observers that we're deleting items. the caller promises
       // to handle whatever UI updating is necessary when we're finished.
       NotifyUnassert(aSource, aProperty, aTarget);
     }
-#endif
 
     return NS_OK;
   }

xpfe/components/winhooks/nsWindowsHooksUtil.cpp

@@ -482,11 +482,7 @@ static void setWindowsXP() {
             RegistryEntry tmp_entry5( HKEY_LOCAL_MACHINE,
                            nsCAutoString( subkey + NS_LITERAL_CSTRING( "\\shell\\properties\\command" ) ).get(),
                            "", nsCAutoString( thisApplication() + 
-#ifndef MOZ_PHOENIX
                                                NS_LITERAL_CSTRING(" -chrome \"chrome://communicator/content/pref/pref.xul\"") ).get()
-#else
-                                               NS_LITERAL_CSTRING(" -chrome \"chrome://browser/content/pref/pref.xul\"") ).get()
-#endif
                           );
             tmp_entry5.set();