Make more tests pass on Windows.

tests/fix_encoding_test.py

 #!/usr/bin/env python
 # coding=utf8
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for fix_encoding.py."""
 
 import os
 import sys
@@ skipping 23 matching lines @@
     # Make sure printing unicode works.
     print self.text
     print >> sys.stderr, self.text
 
   def test_default_encoding(self):
     self.assertEquals('utf-8', sys.getdefaultencoding())
 
   def test_win_console(self):
     if sys.platform != 'win32':
       return
-    # This should fail if redirected. Can be checked with:
-    # python fix_encoding_test.py > a
+    # This should fail if not redirected, e.g. run directly instead of through
+    # the presubmit check. Can be checked with:
+    # python tests\fix_encoding_test.py
     self.assertEquals(
-        sys.stdout.__class__, fix_encoding.WinUnicodeConsoleOutput)
+        sys.stdout.__class__, fix_encoding.WinUnicodeOutput)
     self.assertEquals(
-        sys.stderr.__class__, fix_encoding.WinUnicodeConsoleOutput)
+        sys.stderr.__class__, fix_encoding.WinUnicodeOutput)
     self.assertEquals(sys.stdout.encoding, sys.getdefaultencoding())
     self.assertEquals(sys.stderr.encoding, sys.getdefaultencoding())
 
   def test_multiple_calls(self):
     # Shouldn't do anything.
     self.assertEquals(False, fix_encoding.fix_encoding())
 
 
 if __name__ == '__main__':
   assert fix_encoding.fix_encoding()
   unittest.main()