[android] Convert linker tests to platform mode.

build/android/pylib/linker/test_case.py

 # Copyright 2013 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.
 
 """Base class for linker-specific test cases.
 
    The custom dynamic linker can only be tested through a custom test case
    for various technical reasons:
 
      - It's an 'invisible feature', i.e. it doesn't expose a new API or
@@ skipping 76 matching lines @@
       logging.debug('Found browser match: %s', browser_match.group(0))
       renderer_match = logmon.WaitFor(_RE_RENDERER_STATUS_LINE,
                                       timeout=timeout)
       logging.debug('Found renderer match: %s', renderer_match.group(0))
       if (browser_match.group(1) != 'SUCCESS'
           or renderer_match.group(1) != 'SUCCESS'):
         result = ResultType.FAIL
     except device_errors.CommandTimeoutError:
       result = ResultType.TIMEOUT
 
-    return result, '\n'.join(device.adb.Logcat(dump=True))
+    logcat = device.adb.Logcat(dump=True)
+
+  logmon.Close()
+  return result, '\n'.join(logcat)
 
 
 class LibraryLoadMap(dict):
   """A helper class to pretty-print a map of library names to load addresses."""
   def __str__(self):
     items = ['\'%s\': 0x%x' % (name, address) for \
         (name, address) in self.iteritems()]
     return '{%s}' % (', '.join(items))
 
   def __repr__(self):
@@ skipping 67 matching lines @@
     # Run the test.
     status, logs = self._RunTest(device)
 
     result_text = 'OK'
     if status == ResultType.FAIL:
       result_text = 'FAILED'
     elif status == ResultType.TIMEOUT:
       result_text = 'TIMEOUT'
     print '[ %*s ] %s' % (margin, result_text, self.tagged_name)
 
-    results = base_test_result.TestRunResults()
-    results.AddResult(
-        base_test_result.BaseTestResult(
-            self.tagged_name,
-            status,
-            log=logs))
+    return base_test_result.BaseTestResult(self.tagged_name, status, log=logs)
 
-    return results
 
   def __str__(self):
     return self.tagged_name
 
   def __repr__(self):
     return self.tagged_name
 
 
 class LinkerSharedRelroTest(LinkerTestCaseBase):
   """A linker test case to check the status of shared RELRO sections.
@@ skipping 15 matching lines @@
 
         Note that there can be other lines beginning with BROWSER_LINKER_TEST:
         and RENDERER_LINKER_TEST:, but are not followed by a <status> code.
 
       - The test case passes if the <status> for both the browser and renderer
         process are SUCCESS. Otherwise its a fail.
   """
   def _RunTest(self, device):
     # Wait up to 30 seconds until the linker test status is in the logcat.
     return _StartActivityAndWaitForLinkerTestStatus(device, timeout=30)