M build-tests.xml

- comment in all tests

M classes_spec/org/mozilla/webclient/Navigation2.java
M classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java

- add loadFromStreamBlocking, until we have DocumentLoadListener working

M src_moz/InputStreamShim.cpp
M src_moz/InputStreamShim.h

- rollback the nsIAsyncInputStream changes.

M test/automated/src/classes/org/mozilla/webclient/NavigationTest.java

- test from a FileInputStream

M test/automated/src/classes/org/mozilla/webclient/RandomHTMLInputStream.java

- Allow notification when read completes.


git-svn-id: svn://10.0.0.236/trunk@157311 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/java/webclient/src_moz/InputStreamShim.h

@@ -22,17 +22,14 @@
 #ifndef InputStreamShim_h
 #define InputStreamShim_h
 
-#include "nsIAsyncInputStream.h"
-#include "nsCOMPtr.h"
+#include "nsIInputStream.h"
 
 #include <jni.h>
 
-
-
 class InputStreamShimActionEvent;
 struct PRLock; 
 
-class InputStreamShim : public nsIAsyncInputStream
+class InputStreamShim : public nsIInputStream
 {
 public:
     InputStreamShim(jobject yourJavaStreamRef,
@@ -79,9 +76,7 @@ private:
 
     // nsIInputStream methods
     NS_DECL_NSIINPUTSTREAM
-    
-    // nsIAsyncInputStream
-    NS_DECL_NSIASYNCINPUTSTREAM
+
 protected:
 
     /**
@@ -179,12 +174,6 @@ protected:
      */
 
     PRLock *mLock;
-
-    nsresult mCloseStatus;
-
-    nsCOMPtr<nsIInputStreamCallback> mCallback;
-
-    PRUint32 mCallbackFlags;
 };
 
 #endif // InputStreamShim_h