Using NS_METHOD to satisfy windows compiler instead of nsresult.

extensions/cookie/nsCookieHTTPNotify.cpp

@@ -51,7 +51,7 @@ nsresult nsCookieHTTPNotify::Create(nsISupports *aOuter, REFNSIID aIID, void **a
     return nsCookieHTTPNotifyConstructor(aOuter, aIID, aResult);
 }
 
-nsresult nsCookieHTTPNotify::RegisterProc(nsIComponentManager *aCompMgr,
+NS_METHOD nsCookieHTTPNotify::RegisterProc(nsIComponentManager *aCompMgr,
                                            nsIFile *aPath,
                                            const char *registryLocation,
                                            const char *componentType)
@@ -72,7 +72,7 @@ nsresult nsCookieHTTPNotify::RegisterProc(nsIComponentManager *aCompMgr,
 
 }
 
-nsresult nsCookieHTTPNotify::UnregisterProc(nsIComponentManager *aCompMgr,
+NS_METHOD nsCookieHTTPNotify::UnregisterProc(nsIComponentManager *aCompMgr,
                                              nsIFile *aPath,
                                              const char *registryLocation)
 {

extensions/cookie/nsCookieHTTPNotify.h

@@ -53,11 +53,11 @@ public:
   virtual ~nsCookieHTTPNotify();
 
   static nsresult Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-  static nsresult RegisterProc(nsIComponentManager *aCompMgr,
+  static NS_METHOD RegisterProc(nsIComponentManager *aCompMgr,
                                 nsIFile *aPath,
                                 const char *registryLocation,
                                 const char *componentType);
-  static nsresult UnregisterProc(nsIComponentManager *aCompMgr,
+  static NS_METHOD UnregisterProc(nsIComponentManager *aCompMgr,
                                   nsIFile *aPath,
                                   const char *registryLocation);
 

extensions/cookie/nsCookieService.cpp

@@ -181,10 +181,8 @@ static nsModuleComponentInfo components[] = {
       NS_COOKIEHTTPNOTIFY_CID,
       NS_COOKIEHTTPNOTIFY_PROGID,
       nsCookieHTTPNotifyConstructor,
-#if 0
       nsCookieHTTPNotify::RegisterProc,
       nsCookieHTTPNotify::UnregisterProc
-#endif
     },
 };