Bug 1295672 - Bustage fix due to Bug 1294645 (Don't use NS_CALLBACK for callbacks in nsI{Input,Output,UnicharInput},Stream.idl) r=IanN a=IanN

suite/feeds/src/nsFeedSniffer.cpp

@@ -201,7 +201,7 @@ nsFeedSniffer::GetMIMETypeFromContent(nsIRequest* request,
   // Check that this is a GET request, since you can't subscribe to a POST...
   nsAutoCString method;
   channel->GetRequestMethod(method);
-  if (!method.Equals("GET")) {
+  if (!method.EqualsLiteral("GET")) {
     sniffedType.Truncate();
     return NS_OK;
   }
@@ -324,7 +324,7 @@ nsFeedSniffer::OnStartRequest(nsIRequest* request, nsISupports* context)
   return NS_OK;
 }
 
-NS_METHOD
+nsresult
 nsFeedSniffer::AppendSegmentToString(nsIInputStream* inputStream,
                                      void* closure,
                                      const char* rawSegment,

suite/feeds/src/nsFeedSniffer.h

@@ -24,12 +24,12 @@ public:
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSISTREAMLISTENER
 
-  static NS_METHOD AppendSegmentToString(nsIInputStream* inputStream,
-                                         void* closure,
-                                         const char* rawSegment,
-                                         uint32_t toOffset,
-                                         uint32_t count,
-                                         uint32_t* writeCount);
+  static nsresult AppendSegmentToString(nsIInputStream* inputStream,
+                                        void* closure,
+                                        const char* rawSegment,
+                                        uint32_t toOffset,
+                                        uint32_t count,
+                                        uint32_t* writeCount);
 
 protected:
   ~nsFeedSniffer() {}