Using NS_METHOD to satisfy windows compiler instead of nsresult.

extensions/cookie/nsCookieHTTPNotify.cpp

@@ -51,10 +51,10 @@ nsresult nsCookieHTTPNotify::Create(nsISupports *aOuter, REFNSIID aIID, void **a
     return nsCookieHTTPNotifyConstructor(aOuter, aIID, aResult);
 }
 
-nsresult nsCookieHTTPNotify::RegisterProc(nsIComponentManager *aCompMgr,
-                                                   nsIFile *aPath,
-                                                   const char *registryLocation,
-                                                   const char *componentType)
+NS_METHOD nsCookieHTTPNotify::RegisterProc(nsIComponentManager *aCompMgr,
+                                           nsIFile *aPath,
+                                           const char *registryLocation,
+                                           const char *componentType)
 {
     // Register ourselves into the NS_CATEGORY_HTTP_STARTUP
     nsresult rv;
@@ -72,9 +72,9 @@ nsresult nsCookieHTTPNotify::RegisterProc(nsIComponentManager *aCompMgr,
 
 }
 
-nsresult nsCookieHTTPNotify::UnregisterProc(nsIComponentManager *aCompMgr,
-                                                     nsIFile *aPath,
-                                                     const char *registryLocation)
+NS_METHOD nsCookieHTTPNotify::UnregisterProc(nsIComponentManager *aCompMgr,
+                                             nsIFile *aPath,
+                                             const char *registryLocation)
 {
     nsresult rv;
     nsCOMPtr<nsICategoryManager> catman = do_GetService("mozilla.categorymanager.1", &rv);

extensions/cookie/nsCookieHTTPNotify.h

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

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
     },
 };