remove 1.8 branch ifdefs; keeping in sync with 1.8 branch version of this file; r=me

content/canvas/src/nsCanvasRenderingContext2D.cpp

@@ -982,7 +982,6 @@ nsCanvasRenderingContext2D::GetInputStream(const nsACString& aMimeType,
                                            const nsAString& aEncoderOptions,
                                            nsIInputStream **aStream)
 {
-#ifndef MOZILLA_1_8_BRANCH
     nsCString conid(NS_LITERAL_CSTRING("@mozilla.org/image/encoder;2?type="));
     conid += aMimeType;
 
@@ -1021,9 +1020,6 @@ nsCanvasRenderingContext2D::GetInputStream(const nsACString& aMimeType,
     }
 
     return CallQueryInterface(encoder, aStream);
-#else
-    return NS_ERROR_FAILURE;
-#endif
 }
 
 //