Make more tests pass on Windows.

tests/fix_encoding_test.py

Index: tests/fix_encoding_test.py
diff --git a/tests/fix_encoding_test.py b/tests/fix_encoding_test.py
index d4f49f4d13f94a0bd72672ead26a1335af3e0961..c8bfbc29dc733f29d6348b88e143cee6a5cb5862 100755
--- a/tests/fix_encoding_test.py
+++ b/tests/fix_encoding_test.py
@@ -41,12 +41,13 @@ class FixEncodingTest(unittest.TestCase):
   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())