Backing out change to write the override charset in a meta tag.

The charset menu should be changing the meta tag in the document,
which the output sink will pick up automatically without needing
any special code.  See bugs 12085 (on seeing two meta charset tags)
and 7849 (that the charset menu should change the actual meta tag
in the document).

htmlparser/src/nsHTMLContentSinkStream.cpp

@@ -935,15 +935,6 @@ void nsHTMLContentSinkStream::AddStartTag(const nsIParserNode& aNode)
 
   if (tag == eHTMLTag_head)
   {
-    if (mCharsetOverride.Length() > 0)
-    {
-      Write(NS_LINEBREAK);
-      Write("<meta http-equiv=\"Content-Type\" content=\"text/html\"; charset=\"");
-      Write(mCharsetOverride);
-      Write("\">");
-      Write(NS_LINEBREAK);
-    }
-
     if(mDoHeader)
     {
       Write(gHeaderComment);

parser/htmlparser/src/nsHTMLContentSinkStream.cpp

@@ -935,15 +935,6 @@ void nsHTMLContentSinkStream::AddStartTag(const nsIParserNode& aNode)
 
   if (tag == eHTMLTag_head)
   {
-    if (mCharsetOverride.Length() > 0)
-    {
-      Write(NS_LINEBREAK);
-      Write("<meta http-equiv=\"Content-Type\" content=\"text/html\"; charset=\"");
-      Write(mCharsetOverride);
-      Write("\">");
-      Write(NS_LINEBREAK);
-    }
-
     if(mDoHeader)
     {
       Write(gHeaderComment);