Backout of changeset 9acd51502a65 from bug 579846. a=bustage

parser/html/nsHtml5StreamParser.cpp

@@ -41,7 +41,6 @@
 #include "nsHtml5StreamParser.h"
 #include "nsICharsetConverterManager.h"
 #include "nsICharsetAlias.h"
-#include "nsICacheInfoChannel.h"
 #include "nsServiceManagerUtils.h"
 #include "nsEncoderDecoderUtils.h"
 #include "nsContentUtils.h"
@@ -221,7 +220,6 @@ nsHtml5StreamParser::~nsHtml5StreamParser()
   mTokenizer->end();
   NS_ASSERTION(!mFlushTimer, "Flush timer was not dropped before dtor!");
 #ifdef DEBUG
-  mCacheEntryClosePreventer = nsnull;
   mRequest = nsnull;
   mObserver = nsnull;
   mUnicodeDecoder = nsnull;
@@ -560,17 +558,6 @@ nsHtml5StreamParser::OnStartRequest(nsIRequest* aRequest, nsISupports* aContext)
   }
   mRequest = aRequest;
 
-  // We must keep the cache entry hold lock to prevent the channel from
-  // dropping the cache entry after OnStopRequest.  We may need to modify
-  // the cache entry asynchronously, after OnStopRequest.
-  // See bug 579846.
-  nsCOMPtr<nsICacheInfoChannel_GECKO_2_0> cacheInfoChannel =
-      do_QueryInterface(aRequest);
-  if (cacheInfoChannel) {
-    cacheInfoChannel->
-      GetCacheEntryClosePreventer(getter_AddRefs(mCacheEntryClosePreventer));
-  }
-
   mStreamState = STREAM_BEING_READ;
 
   PRBool scriptingEnabled = mExecutor->IsScriptEnabled();