Revert of Logdog for logcats

build/android/pylib/local/device/local_device_environment.py

 # Copyright 2014 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.
 
 import datetime
 import functools
 import logging
 import os
 import shutil
 import tempfile
@@ skipping 170 matching lines @@
       with open(cache_path, 'w') as f:
         f.write(d.DumpCacheData())
         logging.info('Wrote device cache: %s', cache_path)
 
     self.parallel_devices.pMap(tear_down_device)
 
     for m in self._logcat_monitors:
       try:
         m.Stop()
         m.Close()
-        _, temp_path = tempfile.mkstemp()
-        with open(m.output_file, 'r') as infile:
-          with open(temp_path, 'w') as outfile:
-            for line in infile:
-              outfile.write('Device(%s) %s' % (m.adb.GetDeviceSerial(), line))
-        shutil.move(temp_path, m.output_file)
       except base_error.BaseError:
         logging.exception('Failed to stop logcat monitor for %s',
                           m.adb.GetDeviceSerial())
-      except IOError:
-        logging.exception('Failed to locate logcat for device %s',
-                          m.adb.GetDeviceSerial())
 
     if self._logcat_output_file:
       file_utils.MergeFiles(
           self._logcat_output_file,
           [m.output_file for m in self._logcat_monitors])
       shutil.rmtree(self._logcat_output_dir)
 
   def BlacklistDevice(self, device, reason='local_device_failure'):
     device_serial = device.adb.GetDeviceSerial()
     if self._blacklist:
       self._blacklist.Extend([device_serial], reason=reason)
     with self._devices_lock:
       self._devices = [d for d in self._devices if str(d) != device_serial]