#90581 Cyrillic is not autodetected by nsIStringCharsetDetector

r= roy, sr=waterson

extensions/universalchardet/src/base/nsUniversalDetector.cpp

@@ -41,9 +41,8 @@ static NS_DEFINE_CID(kUniversalStringDetectorCID, NS_UNIVERSAL_STRING_DETECTOR_C
 nsUniversalDetector::nsUniversalDetector()
 {
   mDone = PR_FALSE;
-	mBestGuess = -1;   //illegal value as signal
-	mAvailable = PR_FALSE;
-	mInTag = PR_FALSE;
+  mBestGuess = -1;   //illegal value as signal
+  mInTag = PR_FALSE;
   mEscCharSetProber = nsnull;
 
   mStart = PR_TRUE;
@@ -71,7 +70,6 @@ nsUniversalDetector::Reset()
 {
   mDone = PR_FALSE;
   mBestGuess = -1;   //illegal value as signal
-  mAvailable = PR_FALSE;
   mInTag = PR_FALSE;
   mEscCharSetProber = nsnull;
 

extensions/universalchardet/src/base/nsUniversalDetector.h

@@ -57,7 +57,6 @@ protected:
    virtual void Report(const char* aCharset) = 0;
    virtual void Reset();
    nsInputState  mInputState;
-   PRBool  mAvailable;		//the model is not available for this instance
    PRBool  mDone;
    PRBool  mInTag;
    PRBool  mStart;

extensions/universalchardet/src/xpcom/nsUniversalCharDetModule.cpp

@@ -83,7 +83,7 @@ static nsModuleComponentInfo components[] =
     NS_CHARSET_DETECTOR_CONTRACTID_BASE "universal_charset_detector", nsUniversalXPCOMDetectorConstructor, 
     nsUniversalCharDetectorRegistrationProc, NULL},
    { "Universal String Charset Detector", NS_UNIVERSAL_STRING_DETECTOR_CID, 
-    NS_STRCDETECTOR_CONTRACTID_BASE "universal_string_charset_detector", nsUniversalXPCOMStringDetectorConstructor, 
+    NS_STRCDETECTOR_CONTRACTID_BASE "universal_charset_detector", nsUniversalXPCOMStringDetectorConstructor, 
     NULL, NULL}
 };