Fix tests on Windows

tests/subprocess2_test.py

 #!/usr/bin/env python
 # 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 subprocess2.py."""
 
 import optparse
 import os
 import sys
@@ skipping 150 matching lines @@
       self.fail()
     except TypeError:
       pass
 
   def test_stdout_void(self):
     (out, err), code = subprocess2.communicate(
          self.exe + ['--stdout', '--stderr'],
          stdout=subprocess2.VOID,
          stderr=subprocess2.PIPE)
     self.assertEquals(None, out)
-    self.assertEquals('a\nbb\nccc\n', err)
+    expected = 'a\nbb\nccc\n'
+    if sys.platform == 'win32':
+      expected = expected.replace('\n', '\r\n')
+    self.assertEquals(expected, err)
     self.assertEquals(0, code)
 
   def test_stderr_void(self):
     (out, err), code = subprocess2.communicate(
          self.exe + ['--stdout', '--stderr'],
          universal_newlines=True,
          stdout=subprocess2.PIPE,
          stderr=subprocess2.VOID)
     self.assertEquals('A\nBB\nCCC\n', out)
     self.assertEquals(None, err)
@@ skipping 77 matching lines @@
   do('CCC')
   if options.sleep:
     time.sleep(10)
   return options.return_value
 
 
 if __name__ == '__main__':
   if len(sys.argv) > 1 and sys.argv[1] == '--child':
     sys.exit(child_main(sys.argv[2:]))
   unittest.main()