Revert of [Android] Stop using universal_newlines in the layout tests server constructor.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py

 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 494 matching lines @@
     def _shut_down_http_server(self, pid):
         return self._host_port._shut_down_http_server(pid)
 
     def _driver_class(self):
         return ChromiumAndroidDriver
 
     # Local private methods.
 
     @staticmethod
     def _android_server_process_constructor(port, server_name, cmd_line, env=None, more_logging=False):
+        # We need universal_newlines=True, because 'adb shell' for some unknown reason
+        # does newline conversion of unix-style LF into win-style CRLF (and we need
+        # to convert that back). This can cause headaches elsewhere because
+        # server_process' stdout and stderr are now unicode file-like objects,
+        # not binary file-like objects like all of the other ports are.
+        # FIXME: crbug.com/496983.
         return server_process.ServerProcess(port, server_name, cmd_line, env,
-                                            treat_no_data_as_crash=True, more_logging=more_logging)
+                                            universal_newlines=True, treat_no_data_as_crash=True, more_logging=more_logging)
 
 
 class AndroidPerf(SingleFileOutputProfiler):
     _cached_perf_host_path = None
     _have_searched_for_perf_host = False
 
     def __init__(self, host, executable_path, output_dir, device, symfs_path, kallsyms_path, identifier=None):
         super(AndroidPerf, self).__init__(host, executable_path, output_dir, "data", identifier)
         self._device = device
         self._perf_process = None
@@ skipping 347 matching lines @@
 
         if not self._port.get_option('disable_breakpad'):
             crashes = self._pull_crash_dumps_from_device()
             for crash in crashes:
                 stack = self._port._dump_reader._get_stack_from_dump(crash)  # pylint: disable=protected-access
                 stderr += '********* [%s] breakpad minidump %s:\n%s' % (
                     self._port.host.filesystem.basename(crash),
                     self._device.serial,
                     stack)
 
+        # The parent method expects stdout and stderr to be byte streams, but
+        # since adb shell does newline conversion, we used universal_newlines
+        # when launching the processes, and hence our stdout and stderr are
+        # text objects that need to be encoded back into bytes.
         return super(ChromiumAndroidDriver, self)._get_crash_log(
-            stdout, stderr, newer_than)
+            stdout.encode('utf8', 'replace'),
+            stderr.encode('utf8', 'replace'),
+            newer_than)
 
     def cmd_line(self, pixel_tests, per_test_args):
         # The returned command line is used to start _server_process. In our case, it's an interactive 'adb shell'.
         # The command line passed to the driver process is returned by _driver_cmd_line() instead.
         return [self._device.adb.GetAdbPath(), '-s', self._device.serial, 'shell']
 
     def _android_driver_cmd_line(self, pixel_tests, per_test_args):
         return driver.Driver.cmd_line(self, pixel_tests, per_test_args)
 
     @staticmethod
@@ skipping 235 matching lines @@
         return command
 
     def _read_prompt(self, deadline):
         last_char = ''
         while True:
             current_char = self._server_process.read_stdout(deadline, 1)
             if current_char == ' ':
                 if last_char in ('#', '$'):
                     return
             last_char = current_char